summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/ctype_ucs.test4
-rw-r--r--mysql-test/t/endspace.test8
2 files changed, 5 insertions, 7 deletions
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index 0b8678ef59b..b1d872c58a5 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -4,6 +4,10 @@
DROP TABLE IF EXISTS t1;
--enable_warnings
+SET NAMES latin1;
+SET character_set_connection=ucs2;
+-- source include/endspace.inc
+
SET CHARACTER SET koi8r;
#
diff --git a/mysql-test/t/endspace.test b/mysql-test/t/endspace.test
index 9ee5e32967a..462bc3083e1 100644
--- a/mysql-test/t/endspace.test
+++ b/mysql-test/t/endspace.test
@@ -7,13 +7,7 @@
drop table if exists t1;
--enable_warnings
-select 'a' = 'a', 'a' = 'a ', 'a ' = 'a';
-select 'a\0' = 'a', 'a\0' < 'a', 'a\0' > 'a';
-select 'a' = 'a\0', 'a' < 'a\0', 'a' > 'a\0';
-select 'a\0' = 'a ', 'a\0' < 'a ', 'a\0' > 'a ';
-select 'a ' = 'a\0', 'a ' < 'a\0', 'a ' > 'a\0';
-select 'a a' > 'a', 'a \0' < 'a';
-select binary 'a a' > 'a', binary 'a \0' > 'a', binary 'a\0' > 'a';
+-- source include/endspace.inc
#
# Test MyISAM tables.