Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit8cbda7c

Browse files
committed
Fix breakage I introduced yesterday in MULTIBYTE compilations.
Sorry 'bout that, chief...
1 parent62cc75c commit8cbda7c

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

‎src/backend/commands/variable.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* 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 $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -665,6 +665,14 @@ reset_client_encoding(void)
665665
return TRUE;
666666
}
667667

668+
/* Called during MULTIBYTE backend startup ... */
669+
void
670+
set_default_client_encoding(void)
671+
{
672+
reset_client_encoding();
673+
}
674+
675+
668676
staticbool
669677
parse_server_encoding(char*value)
670678
{

‎src/backend/tcop/postgres.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* 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 $
1212
*
1313
* NOTES
1414
* 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
15931593
#ifdefMULTIBYTE
15941594
/* set default client encoding */
15951595
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();
15981598
#endif
15991599

16001600
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
16181618
if (!IsUnderPostmaster)
16191619
{
16201620
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");
16221622
}
16231623

16241624
/*

‎src/include/commands/variable.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Headers for handling of 'SET var TO', 'SHOW var' and 'RESET var'
33
* statements
44
*
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 $
66
*
77
*/
88
#ifndefVARIABLE_H
@@ -13,5 +13,6 @@ extern void GetPGVariable(const char *name);
1313
externvoidResetPGVariable(constchar*name);
1414

1515
externvoidset_default_datestyle(void);
16+
externvoidset_default_client_encoding(void);
1617

1718
#endif/* VARIABLE_H */

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp