Fix oversight: ignore-till-SYNC state should not ignore EOF ...

tglsfdc · tglsfdc · commit 2a2f6cfa3983 · 2003-05-14T18:40:37.000Z
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.344 2003/05/14 03:26:01 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.345 2003/05/14 18:40:37 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -309,6 +309,7 @@ SocketBackend(StringInfo inBuf)
 
 		case 'X':				/* terminate */
 			doing_extended_query_message = false;
+			ignore_till_sync = false;
 			break;
 
 		case 'B':				/* bind */
@@ -2525,7 +2526,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.344 $ $Date: 2003/05/14 03:26:01 $\n");
+		puts("$Revision: 1.345 $ $Date: 2003/05/14 18:40:37 $\n");
 	}
 
 	/*
@@ -2714,7 +2715,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 		/*
 		 * (6) process the command.  But ignore it if we're skipping till Sync.
 		 */
-		if (ignore_till_sync)
+		if (ignore_till_sync && firstchar != EOF)
 			continue;
 
 		switch (firstchar)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.344 2003/05/14 03:26:01 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.345 2003/05/14 18:40:37 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -309,6 +309,7 @@ SocketBackend(StringInfo inBuf)`
`309`	`309`
`310`	`310`	`case 'X': /* terminate */`
`311`	`311`	`doing_extended_query_message = false;`
	`312`	`+ ignore_till_sync = false;`
`312`	`313`	`break;`
`313`	`314`
`314`	`315`	`case 'B': /* bind */`
`@@ -2525,7 +2526,7 @@ PostgresMain(int argc, char argv[], const char username)`
`2525`	`2526`	`if (!IsUnderPostmaster)`
`2526`	`2527`	`{`
`2527`	`2528`	`puts("\nPOSTGRES backend interactive interface ");`
`2528`		`- puts("$Revision: 1.344 $ $Date: 2003/05/14 03:26:01 $\n");`
	`2529`	`+ puts("$Revision: 1.345 $ $Date: 2003/05/14 18:40:37 $\n");`
`2529`	`2530`	`}`
`2530`	`2531`
`2531`	`2532`	`/*`
`@@ -2714,7 +2715,7 @@ PostgresMain(int argc, char argv[], const char username)`
`2714`	`2715`	`/*`
`2715`	`2716`	`* (6) process the command. But ignore it if we're skipping till Sync.`
`2716`	`2717`	`*/`
`2717`		`- if (ignore_till_sync)`
	`2718`	`+ if (ignore_till_sync && firstchar != EOF)`
`2718`	`2719`	`continue;`
`2719`	`2720`
`2720`	`2721`	`switch (firstchar)`