Apply Postgres 8.4 SQL_ASCII fix

diff --git a/bacula/src/cats/create_postgresql_database.in b/bacula/src/cats/create_postgresql_database.in
index 152eab8e416d2ac10cf8d7025f4d14f57542536f..624a8f1aba6c8fa2b44a9082e89add93cc982841 100644 (file)
--- a/bacula/src/cats/create_postgresql_database.in
+++ b/bacula/src/cats/create_postgresql_database.in
@@ -25,7 +25,7 @@ ENCODING="ENCODING 'SQL_ASCII'"
 #   CREATE DATABASE ${db_name} $ENCODING TEMPLATE template0
 #
 if $bindir/psql -f - -d template1 $* <<END-OF-DATA
-CREATE DATABASE ${db_name} $ENCODING;
+CREATE DATABASE ${db_name} $ENCODING TEMPLATE template0;
 ALTER DATABASE ${db_name} SET datestyle TO 'ISO, YMD';
 END-OF-DATA
 then

diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in
index a9643a12a934022e5cc7aca756342cb0cc0ca404..b27ffb77d94fe78baff684b0b24a953295638ad9 100755 (executable)
--- a/bacula/src/cats/make_catalog_backup.in
+++ b/bacula/src/cats/make_catalog_backup.in
@@ -68,6 +68,6 @@ fi
 #  To read back a PostgreSQL database use:
 #     cd @working_dir@
 #     dropdb bacula
-#     createdb bacula -E SQL_ASCII
+#     createdb bacula -T template0 -E SQL_ASCII
 #     psql bacula <bacula.sql
 #