bzr commit into mysql-pe branch (bar:3678) Bug#45645

[Alexander Barkov]

#At file:///home/bar/mysql-bzr/mysql-pe/ based on revid:kristofer.pettersson@stripped

 3678 Alexander Barkov	2009-10-19 [merge]
      Merging Bug#45645 from mysql-5.1-bugteam.

    modified:
      mysql-test/r/ctype_ldml.result
      mysql-test/t/ctype_ldml.test
      strings/ctype-uca.c
=== modified file 'mysql-test/r/ctype_ldml.result'
--- a/mysql-test/r/ctype_ldml.result	2009-10-12 09:20:04 +0000
+++ b/mysql-test/r/ctype_ldml.result	2009-10-19 13:26:56 +0000
@@ -73,6 +73,14 @@ efgh	efgh
 ijkl	ijkl
 DROP TABLE t1;
 #
+# Bug#45645 Mysql server close all connection and restart using lower function
+#
+CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET utf8 COLLATE utf8_test_ci;
+INSERT INTO t1 (a) VALUES ('hello!');
+SELECT * FROM t1 WHERE LOWER(a)=LOWER('N');
+a
+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	2009-10-12 09:20:04 +0000
+++ b/mysql-test/t/ctype_ldml.test	2009-10-19 13:26:56 +0000
@@ -57,6 +57,14 @@ SELECT * FROM t1 WHERE col1=col2 ORDER B
 DROP TABLE t1;
 
 --echo #
+--echo # Bug#45645 Mysql server close all connection and restart using lower function
+--echo #
+CREATE TABLE t1 (a VARCHAR(10)) CHARACTER SET utf8 COLLATE utf8_test_ci;
+INSERT INTO t1 (a) VALUES ('hello!');
+SELECT * FROM t1 WHERE LOWER(a)=LOWER('N');
+DROP TABLE t1;
+
+--echo #
 --echo # Bug#43827 Server closes connections and restarts
 --echo #
 # Crash happened with a user-defined utf8 collation,

=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2009-10-06 12:55:28 +0000
+++ b/strings/ctype-uca.c	2009-10-19 13:26:56 +0000
@@ -7920,6 +7920,8 @@ static my_bool create_tailoring(CHARSET_
     return 1;
   }
   
+  cs->caseinfo= my_unicase_default;
+  
   if (!(newweights= (uint16**) (*alloc)(256*sizeof(uint16*))))
     return 1;
   bzero(newweights, 256*sizeof(uint16*));


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