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

mhagander · mhagander · commit cfb9c7f8b5cc · 2009-01-19T15:34:23.000Z
Hiroshi Inoue
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
@@ -42,7 +42,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.211 2009/01/07 04:26:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.212 2009/01/19 15:34:23 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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
@@ -4,7 +4,7 @@
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.76 2009/01/04 18:37:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.77 2009/01/19 15:34:23 mha Exp $
  */
 #include "postgres.h"
 
@@ -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
 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`*`
`43`	`43`	`*`
`44`	`44`	`* IDENTIFICATION`
`45`		`- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.211 2009/01/07 04:26:46 momjian Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.212 2009/01/19 15:34:23 mha Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -308,7 +308,7 @@ errstart(int elevel, const char *filename, int lineno,`
`308`	`308`	`edata->lineno = lineno;`
`309`	`309`	`edata->funcname = funcname;`
`310`	`310`	`/* the default text domain is the backend's */`
`311`		`- edata->domain = domain ? domain : "postgres";`
	`311`	`+ edata->domain = domain ? domain : PG_TEXTDOMAIN("postgres");`
`312`	`312`	`/* Select default errcode based on elevel */`
`313`	`313`	`if (elevel >= ERROR)`
`314`	`314`	`edata->sqlerrcode = ERRCODE_INTERNAL_ERROR;`