diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2002-05-09 13:30:24 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2002-05-09 13:30:24 +0000 |
| commit | 1944bff1d6311735df02aa714c7966281ff97a53 (patch) | |
| tree | 8da222202fe234f5b9b71cc999d5857edcb2fb37 /src/backend/access/transam/xlog.c | |
| parent | 16e22de53ab530843237121fa4daf12da24f1d41 (diff) | |
| download | postgresql-1944bff1d6311735df02aa714c7966281ff97a53.tar.gz postgresql-1944bff1d6311735df02aa714c7966281ff97a53.zip | |
Make initdb print a message about which locale it is about to use.
Re-add warning if the locale prevents LIKE-optimization. Done within
initdb now.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index a6a51f7f604..eca4a5de5f8 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.93 2002/04/24 01:54:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.94 2002/05/09 13:30:24 petere Exp $ * *------------------------------------------------------------------------- */ @@ -39,7 +39,6 @@ #include "storage/spin.h" #include "utils/builtins.h" #include "utils/relcache.h" -#include "utils/selfuncs.h" #include "miscadmin.h" @@ -2108,19 +2107,6 @@ WriteControlFile(void) elog(PANIC, "invalid LC_CTYPE setting"); StrNCpy(ControlFile->lc_ctype, localeptr, LOCALE_NAME_BUFLEN); - /* - * Issue warning WARNING if initdb'ing in a locale that will not permit - * LIKE index optimization. This is not a clean place to do it, but I - * don't see a better place either... - */ - if (!locale_is_like_safe()) - elog(WARNING, "Initializing database with %s collation order." - "\n\tThis locale setting will prevent use of index optimization for" - "\n\tLIKE and regexp searches. If you are concerned about speed of" - "\n\tsuch queries, you may wish to set LC_COLLATE to \"C\" and" - "\n\tre-initdb. For more information see the Administrator's Guide.", - ControlFile->lc_collate); - /* Contents are protected with a CRC */ INIT_CRC64(ControlFile->crc); COMP_CRC64(ControlFile->crc, |