bzr push into mysql-trunk-bugfixing branch (bar:3250 to 3251) Bug#37244

[Alexander Barkov]

 3251 Alexander Barkov	2010-09-01
      This changeset is only adding tests to cover:
        Bug#37244 Character sets: short utf8_bin weight_string value
      
      The bug was fixed earlier, by the patch for 
      Bug#55980 Character sets: supplementary character _bin ordering is wrong

    modified:
      mysql-test/include/ctype_filesort2.inc
      mysql-test/r/ctype_utf16.result
      mysql-test/r/ctype_utf32.result
      mysql-test/r/ctype_utf8mb4.result
 3250 Alexander Barkov	2010-09-01 [merge]
      Merging Bug#55980 from mysql-5.5-bugfixing and
      applying "WL#3664 strnxfrm() changes for prefix keys and NOPAD"
      related changes.

    added:
      mysql-test/include/ctype_filesort2.inc
    modified:
      include/m_ctype.h
      mysql-test/r/ctype_utf16.result
      mysql-test/r/ctype_utf32.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/t/ctype_utf16.test
      mysql-test/t/ctype_utf32.test
      mysql-test/t/ctype_utf8mb4.test
      strings/ctype-ucs2.c
      strings/ctype-utf8.c
=== modified file 'mysql-test/include/ctype_filesort2.inc'
--- a/mysql-test/include/ctype_filesort2.inc	2010-08-31 13:54:26 +0000
+++ b/mysql-test/include/ctype_filesort2.inc	2010-09-01 06:52:49 +0000
@@ -13,4 +13,6 @@ INSERT INTO t1 VALUES (_utf8mb4 0xCE85),
 SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a;
 ALTER TABLE t1 ADD KEY(a);
 SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a;
+--echo # Additional test for bug#37244 Character sets: short utf8_bin weight_string value
+SELECT HEX(a), HEX(WEIGHT_STRING(a)) FROM t1 ORDER BY a;
 DROP TABLE IF EXISTS t1;

=== modified file 'mysql-test/r/ctype_utf16.result'
--- a/mysql-test/r/ctype_utf16.result	2010-09-01 06:35:04 +0000
+++ b/mysql-test/r/ctype_utf16.result	2010-09-01 06:52:49 +0000
@@ -635,6 +635,13 @@ HEX(a)	HEX(CONVERT(a USING utf8mb4))
 D800DF84	F0908E84
 DBC0DC00	F4808080
 FF9D	EFBE9D
+# Additional test for bug#37244 Character sets: short utf8_bin weight_string value
+SELECT HEX(a), HEX(WEIGHT_STRING(a)) FROM t1 ORDER BY a;
+HEX(a)	HEX(WEIGHT_STRING(a))
+0385	000385
+D800DF84	010384
+DBC0DC00	100000
+FF9D	20FF9D
 DROP TABLE IF EXISTS t1;
 select @@collation_connection;
 @@collation_connection

=== modified file 'mysql-test/r/ctype_utf32.result'
--- a/mysql-test/r/ctype_utf32.result	2010-09-01 06:35:04 +0000
+++ b/mysql-test/r/ctype_utf32.result	2010-09-01 06:52:49 +0000
@@ -634,6 +634,13 @@ HEX(a)	HEX(CONVERT(a USING utf8mb4))
 0000FF9D	EFBE9D
 00010384	F0908E84
 00100000	F4808080
+# Additional test for bug#37244 Character sets: short utf8_bin weight_string value
+SELECT HEX(a), HEX(WEIGHT_STRING(a)) FROM t1 ORDER BY a;
+HEX(a)	HEX(WEIGHT_STRING(a))
+00000385	000385
+0000FF9D	00FF9D
+00010384	010384
+00100000	100000
 DROP TABLE IF EXISTS t1;
 select @@collation_connection;
 @@collation_connection

=== modified file 'mysql-test/r/ctype_utf8mb4.result'
--- a/mysql-test/r/ctype_utf8mb4.result	2010-09-01 06:35:04 +0000
+++ b/mysql-test/r/ctype_utf8mb4.result	2010-09-01 06:52:49 +0000
@@ -1067,6 +1067,13 @@ CE85	CE85
 EFBE9D	EFBE9D
 F0908E84	F0908E84
 F4808080	F4808080
+# Additional test for bug#37244 Character sets: short utf8_bin weight_string value
+SELECT HEX(a), HEX(WEIGHT_STRING(a)) FROM t1 ORDER BY a;
+HEX(a)	HEX(WEIGHT_STRING(a))
+CE85	000385
+EFBE9D	00FF9D
+F0908E84	010384
+F4808080	100000
 DROP TABLE IF EXISTS t1;
 select @@collation_connection;
 @@collation_connection


Attachment: [text/bzr-bundle] bzr/[e-mail]