List:Commits« Previous MessageNext Message »
From:Alexander Barkov Date:March 22 2010 1:05pm
Subject:bzr commit into mysql-pe branch (bar:3989)
View as plain text  
#At file:///home/bar/mysql-bzr/mysql-pe/ based on revid:john.embretsen@stripped

 3989 Alexander Barkov	2010-03-22 [merge]
      Merging from mysql-5.1-bugfixing.

    modified:
      mysql-test/r/ctype_ldml.result
      mysql-test/t/ctype_ldml.test
      mysys/charset.c
=== modified file 'mysql-test/r/ctype_ldml.result'
--- a/mysql-test/r/ctype_ldml.result	2010-02-24 12:06:58 +0000
+++ b/mysql-test/r/ctype_ldml.result	2010-03-22 13:03:14 +0000
@@ -108,6 +108,15 @@ SELECT * FROM t1 WHERE LOWER(a)=LOWER('N
 a
 DROP TABLE t1;
 #
+# Bug#51976 LDML collations issue (cyrillic example)
+#
+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_test_ci);
+INSERT INTO t1 (a) VALUES ('Hello');
+SELECT a, UPPER(a), LOWER(a) FROM t1;
+a	UPPER(a)	LOWER(a)
+Hello	HELLO	hello
+DROP TABLE t1;
+#
 # Bug#43827 Server closes connections and restarts
 #
 CREATE TABLE t1 (c1 VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_test_ci);

=== modified file 'mysql-test/t/ctype_ldml.test'
--- a/mysql-test/t/ctype_ldml.test	2010-02-24 12:06:58 +0000
+++ b/mysql-test/t/ctype_ldml.test	2010-03-22 13:03:14 +0000
@@ -86,6 +86,14 @@ SELECT * FROM t1 WHERE LOWER(a)=LOWER('N
 DROP TABLE t1;
 
 --echo #
+--echo # Bug#51976 LDML collations issue (cyrillic example)
+--echo #
+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_test_ci);
+INSERT INTO t1 (a) VALUES ('Hello');
+SELECT a, UPPER(a), LOWER(a) FROM t1;
+DROP TABLE t1;
+
+--echo #
 --echo # Bug#43827 Server closes connections and restarts
 --echo #
 # Crash happened with a user-defined utf8 collation,

=== modified file 'mysys/charset.c'
--- a/mysys/charset.c	2010-02-27 02:21:59 +0000
+++ b/mysys/charset.c	2010-03-22 13:03:14 +0000
@@ -247,7 +247,8 @@ static int add_collation(CHARSET_INFO *c
 
       newcs->levels_for_compare= 1;
       newcs->levels_for_order= 1;
-      
+      newcs->caseup_multiply= newcs->casedn_multiply= 1;
+
       if (!strcmp(cs->csname,"ucs2") )
       {
 #if defined(HAVE_CHARSET_ucs2) && defined(HAVE_UCA_COLLATIONS)


Attachment: [text/bzr-bundle] bzr/bar@mysql.com-20100322130314-lccmn9b6osotvco9.bundle
Thread
bzr commit into mysql-pe branch (bar:3989) Alexander Barkov22 Mar