diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-11-04 13:44:19 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-11-04 13:44:19 +0100 |
| commit | a9611262fdd7d3ef978f91d25a2416742391adfd (patch) | |
| tree | 5adaea7b6907b699bf0897b456298fd88d89a61e /sql/handler.cc | |
| parent | eba4984e85d18d3764f163eb1a0012a7dcccc30b (diff) | |
| parent | 5a897c8b4ee38e591c3955e848b5a0ba6b332fe8 (diff) | |
| download | mariadb-git-a9611262fdd7d3ef978f91d25a2416742391adfd.tar.gz | |
Merge 5.1-build -> main, to be used in 5.1.30
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index a127b3fa9f2..035a06c6f05 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1278,7 +1278,12 @@ int ha_rollback_trans(THD *thd, bool all) trans->ha_list= 0; trans->no_2pc=0; if (is_real_trans) - thd->transaction.xid_state.xid.null(); + { + if (thd->transaction_rollback_request) + thd->transaction.xid_state.rm_error= thd->main_da.sql_errno(); + else + thd->transaction.xid_state.xid.null(); + } if (all) { thd->variables.tx_isolation=thd->session_tx_isolation; @@ -2765,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; @@ -2779,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; } } |