From 26db818710f3e62234cfee0324046a33bc101392 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 25 Apr 1999 23:30:31 +0000
Subject: [PATCH] It looks like the multibyte regress tests only work if both
 the database encoding and the client encoding match the encoding expected by
 the test.  So, force both of them to be set from the MULTIBYTE environment
 var.  This allows regress tests to be run successfully in multibyte
 environments other than the compiled-in default.

---
 src/test/regress/regress.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index 14f4739b2ba..ac92e60f003 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.25 1999/04/25 21:56:19 tgl Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.26 1999/04/25 23:30:31 tgl Exp $
 #
 if [ $# -eq 0 ]
 then
@@ -47,22 +47,24 @@ echo "=============== destroying old regression database... ================="
 destroydb $HOST regression
 
 echo "=============== creating new regression database...   ================="
-createdb $HOST regression
-if [ $? -ne 0 ]; then
-     echo createdb failed
-     exit 1
-fi
-
-echo "=============== running regression queries...         ================="
-echo "" > regression.diffs
 if [ -n "$MULTIBYTE" ];then
 	mbtests=`echo $MULTIBYTE | tr "[A-Z]" "[a-z]"`
 	PGCLIENTENCODING="$MULTIBYTE"
 	export PGCLIENTENCODING
+	ENCODINGOPT="-E $MULTIBYTE"
 else
 	mbtests=""
 	unset PGCLIENTENCODING
+	ENCODINGOPT=""
 fi
+createdb $ENCODINGOPT $HOST regression
+if [ $? -ne 0 ]; then
+     echo createdb failed
+     exit 1
+fi
+
+echo "=============== running regression queries...         ================="
+echo "" > regression.diffs
 for i in `cat sql/tests` $mbtests
 do
 	$ECHO_N "${i} .. " $ECHO_C
-- 
2.39.5