Commit bde82a86 authored by Ramil Kalimullin's avatar Ramil Kalimullin
Browse files

Fix for bug #40053: 'check table .. for upgrade' doesn't detect 

collation change made in 5.1.24-rc

Problem: 'CHECK TABLE ... FOR UPGRADE' did not check for 
incompatible collation changes made in MySQL 5.1.24-rc.

Fix: add the check.
parent ac1c5f50

sql/handler.cc

+13 −10
Original line number Diff line number Diff line
@@ -2765,7 +2765,7 @@ int handler::check_collation_compatibility() 
{

  ulong mysql_version= table->s->mysql_version;



  if (mysql_version < 50048)

  if (mysql_version < 50124)

  {

    KEY *key= table->key_info;

    KEY *key_end= key + table->s->keys;
@@ -2779,7 +2779,7 @@ int handler::check_collation_compatibility() 
          continue;

        Field *field= table->field[key_part->fieldnr - 1];

        uint cs_number= field->charset()->number;

        if (mysql_version < 50048 &&

        if ((mysql_version < 50048 &&

             (cs_number == 11 || /* ascii_general_ci - bug #29499, bug #27562 */

              cs_number == 41 || /* latin7_general_ci - bug #29461 */

              cs_number == 42 || /* latin7_general_cs - bug #29461 */
@@ -2787,7 +2787,10 @@ int handler::check_collation_compatibility() 
              cs_number == 21 || /* latin2_hungarian_ci - bug #29461 */

              cs_number == 22 || /* koi8u_general_ci - bug #29461 */

              cs_number == 23 || /* cp1251_ukrainian_ci - bug #29461 */

             cs_number == 26))  /* cp1250_general_ci - bug #29461 */

              cs_number == 26)) || /* cp1250_general_ci - bug #29461 */

             (mysql_version < 50124 &&

             (cs_number == 33 || /* utf8_general_ci - bug #27877 */

              cs_number == 35))) /* ucs2_general_ci - bug #27877 */

          return HA_ADMIN_NEEDS_UPGRADE;

      }  

    }