diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-11-06 16:18:25 +0200 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-11-06 16:18:25 +0200 |
| commit | 05dbb26dfcb577321f6a8134ffc0667d07b373ed (patch) | |
| tree | 4b2bfe4af09c67b2c801460c16c33dd5773ea668 /sql/handler.cc | |
| parent | ffed7fd66521b7b22fd3b2adabefd5547b81b59d (diff) | |
| parent | f40fc60cf233fe3c82aeaf7da4d29fa83e600b00 (diff) | |
| download | mariadb-git-05dbb26dfcb577321f6a8134ffc0667d07b373ed.tar.gz | |
merged 5.1 main -> 5.1-bugteam
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index c32e9c759c3..6d5c0c93f75 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2770,7 +2770,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; @@ -2784,15 +2784,18 @@ int handler::check_collation_compatibility() continue; Field *field= table->field[key_part->fieldnr - 1]; uint cs_number= field->charset()->number; - 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 */ - cs_number == 20 || /* latin7_estonian_cs - bug #29461 */ - 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 */ + 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 */ + cs_number == 20 || /* latin7_estonian_cs - bug #29461 */ + 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 */ + (mysql_version < 50124 && + (cs_number == 33 || /* utf8_general_ci - bug #27877 */ + cs_number == 35))) /* ucs2_general_ci - bug #27877 */ return HA_ADMIN_NEEDS_UPGRADE; } } @@ -3338,8 +3341,8 @@ handler::ha_create_handler_files(const char *name, const char *old_name, int handler::ha_change_partitions(HA_CREATE_INFO *create_info, const char *path, - ulonglong *copied, - ulonglong *deleted, + ulonglong * const copied, + ulonglong * const deleted, const uchar *pack_frm_data, size_t pack_frm_len) { |