Fix breakage I introduced yesterday in MULTIBYTE compilations.

Sorry 'bout that, chief...

diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 6fdcfafe8b7a703b4e96be6e62e64271c71b35c1..6034128e3f50cec9ff34fe26aa0d239179cbf972 100644 (file)
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -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 4517a825d6b747c07e0e67758577c3e3c2c0a8a4..1540a2b4840d110965b5999074793779118f424f 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -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 550a0ffea7addece103b798d59eb34680cc06cb5..380be0e4066c269c303e3a4bece178c97d9b75b3 100644 (file)
--- a/src/include/commands/variable.h
+++ b/src/include/commands/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 */