diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1998-07-26 04:31:41 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1998-07-26 04:31:41 +0000 |
| commit | 5979d7384179a41390c1ed122c6cc60d30287e2a (patch) | |
| tree | 5c45522ec5301eefd17f5439c216f9e628b60d3f /src/backend/commands/dbcommands.c | |
| parent | 74b30a3a1f96eb58e7cca0a92fb00bce7e825fbe (diff) | |
| download | postgresql-5979d7384179a41390c1ed122c6cc60d30287e2a.tar.gz postgresql-5979d7384179a41390c1ed122c6cc60d30287e2a.zip | |
From: t-ishii@sra.co.jp
As Bruce mentioned, this is due to the conflict among changes we made.
Included patches should fix the problem(I changed all MB to
MULTIBYTE). Please let me know if you have further problem.
P.S. I did not include pathces to configure and gram.c to save the
file size(configure.in and gram.y modified).
Diffstat (limited to 'src/backend/commands/dbcommands.c')
| -rw-r--r-- | src/backend/commands/dbcommands.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index c2518b5a613..bfaa6e0294b 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.16 1998/07/24 03:31:15 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.17 1998/07/26 04:30:24 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,7 @@ #include "access/htup.h" #include "access/relscan.h" #include "catalog/catname.h" -#ifdef MB +#ifdef MULTIBYTE #include "catalog/pg_database_mb.h" #else #include "catalog/pg_database.h" @@ -47,7 +47,7 @@ static HeapTuple get_pg_dbtup(char *command, char *dbname, Relation dbrel); static void stop_vacuum(char *dbpath, char *dbname); void -#ifdef MB +#ifdef MULTIBYTE createdb(char *dbname, char *dbpath, int encoding) #else createdb(char *dbname, char *dbpath) @@ -98,7 +98,7 @@ createdb(char *dbname, char *dbpath) dbname, user_id, dbname); #endif -#ifdef MB +#ifdef MULTIBYTE sprintf(buf, "insert into pg_database (datname, datdba, encoding, datpath)" " values (\'%s\', \'%d\', \'%d\', \'%s\');", dbname, user_id, encoding, loc); #else |