summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2003-03-19 19:13:28 +0400
committerbar@bar.mysql.r18.ru <>2003-03-19 19:13:28 +0400
commit22cb247c742411a71835d32fa026546804b13782 (patch)
treefd3138007c4fe92a16574563128dcaaf2119608e /mysql-test/t
parent3c455e314b3c4a8ba18245b651be989c4ef05ca0 (diff)
downloadmariadb-git-22cb247c742411a71835d32fa026546804b13782.tar.gz
Strings comparison is now done according to "Collating sequences used for
comparison" table, "SQL Complete, Really", page 162
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/ctype_many.test8
-rw-r--r--mysql-test/t/func_system.test2
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index ddb7034be10..05f3687d330 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -194,10 +194,10 @@ INSERT INTO t1 (ucs2_f,comment) VALUES (0x0566,'ARMENIAN SMALL ZA');
ALTER TABLE t1 ADD armscii8_f CHAR(32) CHARACTER SET armscii8 NOT NULL;
ALTER TABLE t1 ADD greek_f CHAR(32) CHARACTER SET greek NOT NULL;
-UPDATE t1 SET greek_f=CONVERT(ucs2_f USING greek) WHERE comment LIKE 'GRE%';
-UPDATE t1 SET armscii8_f=CONVERT(ucs2_f USING armscii8) WHERE comment LIKE 'ARM%';
-UPDATE t1 SET utf8_f=CONVERT(ucs2_f USING utf8) WHERE utf8_f='';
-UPDATE t1 SET ucs2_f=CONVERT(utf8_f USING ucs2) WHERE ucs2_f='';
+UPDATE t1 SET greek_f=CONVERT(ucs2_f USING greek) WHERE comment LIKE _latin2'GRE%';
+UPDATE t1 SET armscii8_f=CONVERT(ucs2_f USING armscii8) WHERE comment LIKE _latin2'ARM%';
+UPDATE t1 SET utf8_f=CONVERT(ucs2_f USING utf8) WHERE utf8_f=_utf8'';
+UPDATE t1 SET ucs2_f=CONVERT(utf8_f USING ucs2) WHERE ucs2_f=_ucs2'';
SELECT * FROM t1;
SET NAMES 'binary';
SELECT * FROM t1;
diff --git a/mysql-test/t/func_system.test b/mysql-test/t/func_system.test
index c69526644f4..db366e3ab49 100644
--- a/mysql-test/t/func_system.test
+++ b/mysql-test/t/func_system.test
@@ -3,5 +3,5 @@
#
select database(),user() like "%@%";
-select version()>="3.23.29";
+select version()>=_utf8"3.23.29";
select TRUE,FALSE,NULL;