database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00
Code Activity

Fix breakage I introduced yesterday in MULTIBYTE compilations.

Browse Source 
Sorry 'bout that, chief...
This commit is contained in:
Tom Lane
2000-10-26 17:31:35 +00:00
parent 62cc75c8fd
commit 8cbda7cbd0
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/commands/variable.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * 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; return TRUE;
} }
/* Called during MULTIBYTE backend startup ... */
void
set_default_client_encoding(void)
{
reset_client_encoding();
}
static bool static bool
parse_server_encoding(char *value) parse_server_encoding(char *value)
{ {

8
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* this is the "main" module of the postgres backend and * 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 #ifdef MULTIBYTE
/* set default client encoding */ /* set default client encoding */
if (DebugLvl > 1) if (DebugLvl > 1)
elog(DEBUG, "reset_client_encoding"); elog(DEBUG, "set_default_client_encoding");
reset_client_encoding(); set_default_client_encoding();
#endif #endif
on_shmem_exit(remove_all_temp_relations, 0); 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) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); 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");
} }
/* /*

3
src/include/commands/variable.h
View File

@ -2,7 +2,7 @@
* Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var' * Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var'
* statements * 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 #ifndef VARIABLE_H
@ -13,5 +13,6 @@ extern void GetPGVariable(const char *name);
extern void ResetPGVariable(const char *name); extern void ResetPGVariable(const char *name);
extern void set_default_datestyle(void); extern void set_default_datestyle(void);
extern void set_default_client_encoding(void);
#endif /* VARIABLE_H */ #endif /* VARIABLE_H */