summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-05-26 20:22:23 +0500
committerunknown <bar@bar.mysql.r18.ru>2003-05-26 20:22:23 +0500
commit720584b0c6eb435fa87b5da42578f214d83735d1 (patch)
tree44e581c5024f3bc227c59de0debb99b118fac076 /mysql-test
parent12604089b6acd8242a506d021449bdc515b72e14 (diff)
downloadmariadb-git-720584b0c6eb435fa87b5da42578f214d83735d1.tar.gz
--with-charset was not up to date
ctype_ucs2 and ctype_ujis were skipped in mistake
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ctype_ujis.result2
-rw-r--r--mysql-test/r/have_ucs2.require2
-rw-r--r--mysql-test/r/have_ujis.require2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/ctype_ujis.result b/mysql-test/r/ctype_ujis.result
index 223a18f19e9..ffb305a81cf 100644
--- a/mysql-test/r/ctype_ujis.result
+++ b/mysql-test/r/ctype_ujis.result
@@ -1,5 +1,5 @@
drop table if exists t1;
-create table t1 (c text);
+create table t1 (c text character set ujis);
insert into t1 values (0xa4a2),(0xa4a3);
select hex(left(c,1)) from t1 group by c;
hex(left(c,1))
diff --git a/mysql-test/r/have_ucs2.require b/mysql-test/r/have_ucs2.require
index 9d7079740ad..4f2ef7e83e4 100644
--- a/mysql-test/r/have_ucs2.require
+++ b/mysql-test/r/have_ucs2.require
@@ -1,2 +1,2 @@
Collation Charset Id D C Sortlen
-ucs2_general_ci ucs2 35 Y 0
+ucs2_general_ci ucs2 35 Y Y 1
diff --git a/mysql-test/r/have_ujis.require b/mysql-test/r/have_ujis.require
index 5f7ce2a50c7..b4b0a4d256c 100644
--- a/mysql-test/r/have_ujis.require
+++ b/mysql-test/r/have_ujis.require
@@ -1,2 +1,2 @@
Collation Charset Id D C Sortlen
-ujis_japanese_ci ujis 12 Y 0
+ujis_japanese_ci ujis 12 Y Y 0