From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 28 Sep 2010 18:47:25 +0000 (-0400)
Subject: Fix another small oversight in command_no_begin patch.
X-Git-Tag: REL8_3_12~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e20490e862f9da0d7530b8bac80bcb9a5c05cac;p=thirdparty%2Fpostgresql.git

Fix another small oversight in command_no_begin patch.

Need a "return false" to prevent tests from continuing after we've moved
the "query" pointer.  As it stood, it'd accept "DROP DISCARD ALL" as a
match.
---

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 64577084a2f..9670dc62b88 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1350,6 +1350,7 @@ command_no_begin(const char *query)
 			return true;
 		if (wordlen == 10 && pg_strncasecmp(query, "tablespace", 10) == 0)
 			return true;
+		return false;
 	}
 
 	/* DISCARD ALL isn't allowed in xacts, but other variants are allowed. */
@@ -1365,6 +1366,7 @@ command_no_begin(const char *query)
 
 		if (wordlen == 3 && pg_strncasecmp(query, "all", 3) == 0)
 			return true;
+		return false;
 	}
 
 	return false;