From 7cf8a5c302735d193dcf901b87e03e324903c632 Mon Sep 17 00:00:00 2001
From: Simon Riggs <simon@2ndQuadrant.com>
Date: Mon, 2 Apr 2018 21:34:15 +0100
Subject: Revert "Modified files for MERGE"

This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.
---
 src/backend/commands/prepare.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/backend/commands/prepare.c')

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:
-- 
cgit v1.2.3