Cleanup patch from Oleg.

diff --git a/doc/README.locale b/doc/README.locale
index 2bd6af24320b5ca2fde877ffeee65ad244cbadef..c47c4b30bb0b4dc33b598f72d855821371f8c881 100644 (file)
--- a/doc/README.locale
+++ b/doc/README.locale
@@ -1,9 +1,9 @@
 
-1998 May 25
+1998 Nov 20
 
    I extended locale support. Now ORDER BY (if PostgreSQL configured with
 --enable-locale) uses strcoll() for all text fields: char(n), varchar(n),
-text. (I am not sure about ORDER BY char2/char4/etc.)
+text.
 
    I included test suite .../src/test/locale. I didn't include this in
 the regression test because not so much people require locale support. Read

diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile
index 36c951c5d09054a7b193f8e920a105e8ccd6b9f8..c59aba7ab66af12c9d2cce91ba07563af4641b07 100644 (file)
--- a/src/test/locale/Makefile
+++ b/src/test/locale/Makefile
@@ -30,4 +30,4 @@ clean:
        done
 
 test-%: all
-       @cd `echo $@ | sed s/^test-//` && $(MAKE) test
+       @cd `echo $@ | sed 's/^test-//'` && $(MAKE) test

diff --git a/src/test/locale/koi8-r/runall b/src/test/locale/koi8-r/runall
index cf6e3b77c3058a4786469b7e451b00466d0b0acf..a6b81baa823c02ab19ebec3ca5be500852c56b6d 100755 (executable)
--- a/src/test/locale/koi8-r/runall
+++ b/src/test/locale/koi8-r/runall
@@ -41,7 +41,7 @@ for f in char varchar text; do
 
    destroydb testlocale >/dev/null 2>&1
    createdb testlocale || abort "createdb failed"
-   psql -d testlocale -c "CREATE TABLE usastates (abbrev char2, name_en char(20), name_ru $ftype);"  >/dev/null 2>&1 || abort "createtable failed"
+   psql -d testlocale -c "CREATE TABLE usastates (abbrev char(2), name_en char(20), name_ru $ftype);"  >/dev/null 2>&1 || abort "createtable failed"
    psql testlocale < test-koi8.sql.in > test-koi8-$f.sql.out 2>/dev/null || abort "test query failed"
    diff expected/test-koi8-$f.sql.out test-koi8-$f.sql.out
 done