bzr push into mysql-5.1-bugteam branch (bar:3186 to 3187) Bug#45645

[Alexander Barkov]

 3187 Alexander Barkov	2009-10-20
      A post fix for BUG#45645 Mysql server close all connection and restart using lower function
      - Initialized caseinfo only if it is NULL

    modified:
      strings/ctype-uca.c
 3186 Kristofer Pettersson	2009-10-20 [merge]
      Automerge

    modified:
      client/mysqlbinlog.cc
      mysql-test/r/ctype_ldml.result
      mysql-test/r/grant3.result
      mysql-test/r/myisam_crash_before_flush_keys.result
      mysql-test/t/ctype_ldml.test
      mysql-test/t/grant3.test
      mysql-test/t/myisam_crash_before_flush_keys.test
      sql/sql_acl.cc
      strings/ctype-uca.c
=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2009-10-19 13:23:53 +0000
+++ b/strings/ctype-uca.c	2009-10-20 07:47:00 +0000
@@ -7858,7 +7858,8 @@ static my_bool create_tailoring(CHARSET_
     return 1;
   }
   
-  cs->caseinfo= my_unicase_default;
+  if (!cs->caseinfo)
+    cs->caseinfo= my_unicase_default;
   
   if (!(newweights= (uint16**) (*alloc)(256*sizeof(uint16*))))
     return 1;


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