Use the new text domain names ("postgres-8.4" instead of "postgres")

Hiroshi Inoue

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 89163d6c86364a8b68e5b419242e85d8c219e704..a33c94ed67069e338e42b5daebb9eb39fdc5723b 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -308,7 +308,7 @@ errstart(int elevel, const char *filename, int lineno,
        edata->lineno = lineno;
        edata->funcname = funcname;
        /* the default text domain is the backend's */
-       edata->domain = domain ? domain : "postgres";
+       edata->domain = domain ? domain : PG_TEXTDOMAIN("postgres");
        /* Select default errcode based on elevel */
        if (elevel >= ERROR)
                edata->sqlerrcode = ERRCODE_INTERNAL_ERROR;

diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index 3467c31a29f7b679eb8911e2568a149e2b57ae25..7725df471726ae9b2949639364773b265818cc9f 100644 (file)
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -873,7 +873,7 @@ SetDatabaseEncoding(int encoding)
         */
 #ifdef ENABLE_NLS
        if (encoding == PG_UTF8)
-               if (bind_textdomain_codeset("postgres", "UTF-8") == NULL)
+               if (bind_textdomain_codeset(textdomain(NULL), "UTF-8") == NULL)
                        elog(LOG, "bind_textdomain_codeset failed");
 #endif
 }