bzr push into mysql-pe branch (bar:3683 to 3684)

[Alexander Barkov]

 3684 Alexander Barkov	2009-10-20 [merge]
      Merging from 5.1-bugteam

    modified:
      strings/ctype-uca.c
 3683 Satya B	2009-10-20 [merge]
      merge to mysql-pe

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
      sql/sql_yacc.yy
=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2009-10-19 13:26:56 +0000
+++ b/strings/ctype-uca.c	2009-10-20 07:56:01 +0000
@@ -7920,7 +7920,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]