Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Riggs2018-04-02 20:34:15 +0000
committerSimon Riggs2018-04-02 20:34:15 +0000
commit7cf8a5c302735d193dcf901b87e03e324903c632 (patch)
tree0f9815ae865d08f20e7037c148c3078fad0138e7 /src/backend/commands/prepare.c
parent354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb (diff)
Revert "Modified files for MERGE"
This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.
Diffstat (limited to 'src/backend/commands/prepare.c')
-rw-r--r--src/backend/commands/prepare.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index c3610b18741..b945b1556a8 100644
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -151,7 +151,6 @@ PrepareQuery(PrepareStmt *stmt, const char *queryString,
case CMD_INSERT:
case CMD_UPDATE:
case CMD_DELETE:
- case CMD_MERGE:
/* OK */
break;
default: