Fix breakage I introduced yesterday in MULTIBYTE compilations.

tglsfdc · tglsfdc · commit 8cbda7cbd097 · 2000-10-26T17:31:35.000Z
Sorry 'bout that, chief...
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.42 2000/10/25 19:44:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.43 2000/10/26 17:31:34 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -665,6 +665,14 @@ reset_client_encoding(void)
 	return TRUE;
 }
 
+/* Called during MULTIBYTE backend startup ... */
+void
+set_default_client_encoding(void)
+{
+	reset_client_encoding();
+}
+
+
 static bool
 parse_server_encoding(char *value)
 {
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.181 2000/10/24 21:33:48 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.182 2000/10/26 17:31:35 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1593,8 +1593,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 #ifdef MULTIBYTE
 	/* set default client encoding */
 	if (DebugLvl > 1)
-		elog(DEBUG, "reset_client_encoding");
-	reset_client_encoding();
+		elog(DEBUG, "set_default_client_encoding");
+	set_default_client_encoding();
 #endif
 
 	on_shmem_exit(remove_all_temp_relations, 0);
@@ -1618,7 +1618,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.181 $ $Date: 2000/10/24 21:33:48 $\n");
+		puts("$Revision: 1.182 $ $Date: 2000/10/26 17:31:35 $\n");
 	}
 
 	/*
diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h
@@ -2,7 +2,7 @@
  * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var'
  * statements
  *
- * $Id: variable.h,v 1.12 2000/06/22 22:31:23 petere Exp $
+ * $Id: variable.h,v 1.13 2000/10/26 17:31:33 tgl Exp $
  *
  */
 #ifndef VARIABLE_H
@@ -13,5 +13,6 @@ extern void GetPGVariable(const char *name);
 extern void ResetPGVariable(const char *name);
 
 extern void set_default_datestyle(void);
+extern void set_default_client_encoding(void);
 
 #endif	 /* VARIABLE_H */

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.42 2000/10/25 19:44:44 tgl Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.43 2000/10/26 17:31:34 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -665,6 +665,14 @@ reset_client_encoding(void)`
`665`	`665`	`return TRUE;`
`666`	`666`	`}`
`667`	`667`
	`668`	`+/* Called during MULTIBYTE backend startup ... */`
	`669`	`+void`
	`670`	`+set_default_client_encoding(void)`
	`671`	`+{`
	`672`	`+ reset_client_encoding();`
	`673`	`+}`
	`674`	`+`
	`675`	`+`
`668`	`676`	`static bool`
`669`	`677`	`parse_server_encoding(char *value)`
`670`	`678`	`{`
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.181 2000/10/24 21:33:48 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.182 2000/10/26 17:31:35 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -1593,8 +1593,8 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[], const cha`
`1593`	`1593`	`#ifdef MULTIBYTE`
`1594`	`1594`	`/* set default client encoding */`
`1595`	`1595`	`if (DebugLvl > 1)`
`1596`		`- elog(DEBUG, "reset_client_encoding");`
`1597`		`- reset_client_encoding();`
	`1596`	`+ elog(DEBUG, "set_default_client_encoding");`
	`1597`	`+ set_default_client_encoding();`
`1598`	`1598`	`#endif`
`1599`	`1599`
`1600`	`1600`	`on_shmem_exit(remove_all_temp_relations, 0);`
`@@ -1618,7 +1618,7 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[], const cha`
`1618`	`1618`	`if (!IsUnderPostmaster)`
`1619`	`1619`	`{`
`1620`	`1620`	`puts("\nPOSTGRES backend interactive interface ");`
`1621`		`- puts("$Revision: 1.181 $ $Date: 2000/10/24 21:33:48 $\n");`
	`1621`	`+ puts("$Revision: 1.182 $ $Date: 2000/10/26 17:31:35 $\n");`
`1622`	`1622`	`}`
`1623`	`1623`
`1624`	`1624`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var'`
`3`	`3`	`* statements`
`4`	`4`	`*`
`5`		`- * $Id: variable.h,v 1.12 2000/06/22 22:31:23 petere Exp $`
	`5`	`+ * $Id: variable.h,v 1.13 2000/10/26 17:31:33 tgl Exp $`
`6`	`6`	`*`
`7`	`7`	`*/`
`8`	`8`	`#ifndef VARIABLE_H`
`@@ -13,5 +13,6 @@ extern void GetPGVariable(const char *name);`
`13`	`13`	`extern void ResetPGVariable(const char *name);`
`14`	`14`
`15`	`15`	`extern void set_default_datestyle(void);`
	`16`	`+extern void set_default_client_encoding(void);`
`16`	`17`
`17`	`18`	`#endif /* VARIABLE_H */`