bzr push into mysql-6.0-bugteam branch (ramil:3299 to 3300) Bug#40054

[Ramil Kalimullin]

 3300 Ramil Kalimullin	2009-05-19
      Correction of the fix for bug#40054: 'check table .. for upgrade' 
      doesn't detect collation change made in 6.0.{1, 6}
      
      Check for latin2_czech_cs use prior to 6.0.5 as there's a fix for 
      #33452: Primary difference between capital and small letters U and O
      that has changed the collation in 6.0.5.
     @ sql/handler.cc
        Correction of the fix for bug#40054: 'check table .. for upgrade' 
        doesn't detect collation change made in 6.0.{1, 6}
          - check for latin2_czech_cs use prior to 6.0.5 due to fix for #33452.

    modified:
      sql/handler.cc
 3299 Sergey Glukhov	2009-05-19 [merge]
      5.1-bugteam->6.0-bugteam merge
     @ mysql-test/include/mix1.inc
        5.1-bugteam->6.0-bugteam merge
     @ mysql-test/r/innodb_mysql.result
        5.1-bugteam->6.0-bugteam merge
     @ storage/innobase/dict/dict0dict.c
        5.1-bugteam->6.0-bugteam merge

    modified:
      mysql-test/include/mix1.inc
      mysql-test/r/innodb_mysql.result
      storage/innobase/dict/dict0dict.c
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2009-05-07 20:48:24 +0000
+++ b/sql/handler.cc	2009-05-19 09:05:40 +0000
@@ -2846,8 +2846,8 @@ int handler::check_collation_compatibili
             (mysql_version < 50124 &&
              (cs_number == 33 ||   /* utf8_general_ci - bug #27877 */
               cs_number == 35)) || /* ucs2_general_ci - bug #27877 */
-            (mysql_version < 60001 &&
-             (cs_number == 2)) ||  /* latin2_czech_cs - WL #3664 */
+            (mysql_version < 60005 &&
+             (cs_number == 2)) ||  /* latin2_czech_cs - bug #33452 */
             (mysql_version < 60006 &&
              (cs_number == 1 ||    /* big5_chinese_ci - bug #25420 */
               cs_number == 36 ||   /* cp866_general_ci - bug #25420 */


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