summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorAlexander Barkov <alexander.barkov@oracle.com>2012-01-23 13:23:50 +0400
committerAlexander Barkov <alexander.barkov@oracle.com>2012-01-23 13:23:50 +0400
commit31a1f8ef54e4e84cce25d192305d56bcdf8c87d0 (patch)
tree55a46bd596bfdbfb3adc641f4fc3b175041ae6e0 /mysql-test
parent9cb16ec55beecef400dc972965c90a34bc3fc3c0 (diff)
parente449cf48afc34705b601113fd73bce84338c2e37 (diff)
downloadmariadb-git-31a1f8ef54e4e84cce25d192305d56bcdf8c87d0.tar.gz
Merging Bug#11752408 from mysql-5.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ctype_utf8.result24
-rw-r--r--mysql-test/t/ctype_utf8.test8
2 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index 8237f174514..fc306e499d3 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -1928,6 +1928,30 @@ D120
SELECT HEX(INSERT(_utf8 0xD18FD18E, 2, 1, 0x20));
HEX(INSERT(_utf8 0xD18FD18E, 2, 1, 0x20))
D120D18E
+#
+# Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8_GENERAL_CI
+#
+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_general_mysql500_ci);
+INSERT INTO t1 VALUES ('a'),('r'),('s'),(_latin1 0xDF),(_latin1 0xF7),('t'),('z');
+SELECT * FROM t1 ORDER BY a;
+a
+a
+r
+s
+t
+z
+SELECT a, COUNT(*) FROM t1 GROUP BY a;
+a COUNT(*)
+a 1
+r 1
+s 1
+t 1
+z 1
+ß 1
+÷ 1
+DROP TABLE t1;
End of 5.1 tests
Start of 5.4 tests
SET NAMES utf8mb3;
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index 8254f99249f..acf16568319 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -1455,6 +1455,14 @@ SELECT HEX(LPAD(_utf8 0xD18F, 3, 0x20));
SELECT HEX(INSERT(_utf8 0xD18F, 2, 1, 0x20));
SELECT HEX(INSERT(_utf8 0xD18FD18E, 2, 1, 0x20));
+--echo #
+--echo # Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8_GENERAL_CI
+--echo #
+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_general_mysql500_ci);
+INSERT INTO t1 VALUES ('a'),('r'),('s'),(_latin1 0xDF),(_latin1 0xF7),('t'),('z');
+SELECT * FROM t1 ORDER BY a;
+SELECT a, COUNT(*) FROM t1 GROUP BY a;
+DROP TABLE t1;
--echo End of 5.1 tests