From 8cbda7cbd0971694feb168ad4c37de0ce00f91d0 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 26 Oct 2000 17:31:35 +0000
Subject: [PATCH] Fix breakage I introduced yesterday in MULTIBYTE
compilations. Sorry 'bout that, chief...
---
src/backend/commands/variable.c | 10 +++++++++-
src/backend/tcop/postgres.c | 8 ++++----
src/include/commands/variable.h | 3 ++-
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 04382cde279..1e12f17c795 100644
--- 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
index d4c37c91a07..5b65e42172e 100644
--- 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
index 87334dda4d4..c1e9541e5a8 100644
--- 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 */
--
GitLab