diff options
| author | unknown <istruewing@chilla.local> | 2007-07-21 03:10:23 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-07-21 03:10:23 +0200 |
| commit | 36b431d86961c1e4338dfb858afd1e79ec44a14c (patch) | |
| tree | 8a84ef8de37ed5085da4826a6898b13d3621d4cb /storage | |
| parent | 43a6c7804b926a24f13b63074b1ad8eec685ea39 (diff) | |
| parent | b012fca45adaadf00427a2e6761f85f5e8c0af6c (diff) | |
| download | mariadb-git-36b431d86961c1e4338dfb858afd1e79ec44a14c.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1-ateam
into chilla.local:/home/mydev/mysql-5.1-axmrg
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/federated/ha_federated.cc | 17 | ||||
| -rw-r--r-- | storage/federated/ha_federated.h | 1 |
2 files changed, 16 insertions, 2 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 635a6fa79e0..67dc37a8ff2 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -449,6 +449,13 @@ int federated_db_init(void *p) federated_hton->create= federated_create_handler; federated_hton->flags= HTON_ALTER_NOT_SUPPORTED | HTON_NO_PARTITION; + /* + Support for transactions disabled until WL#2952 fixes it. + We do it like this to avoid "defined but not used" compiler warnings. + */ + federated_hton->commit= 0; + federated_hton->rollback= 0; + if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST)) goto error; if (!hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0, @@ -3160,11 +3167,16 @@ bool ha_federated::get_error_message(int error, String* buf) int ha_federated::external_lock(THD *thd, int lock_type) { int error= 0; - ha_federated *trx= (ha_federated *)thd->ha_data[ht->slot]; DBUG_ENTER("ha_federated::external_lock"); + /* + Support for transactions disabled until WL#2952 fixes it. + */ +#ifdef XXX_SUPERCEDED_BY_WL2952 if (lock_type != F_UNLCK) { + ha_federated *trx= (ha_federated *)thd->ha_data[ht->slot]; + DBUG_PRINT("info",("federated not lock F_UNLCK")); if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) { @@ -3216,7 +3228,8 @@ int ha_federated::external_lock(THD *thd, int lock_type) } } } - DBUG_RETURN(0); +#endif /* XXX_SUPERCEDED_BY_WL2952 */ + DBUG_RETURN(error); } diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h index 3443194817b..b6c99f4d3aa 100644 --- a/storage/federated/ha_federated.h +++ b/storage/federated/ha_federated.h @@ -141,6 +141,7 @@ public: | HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_CAN_INDEX_BLOBS | HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE | HA_NO_PREFIX_CHAR_KEYS | HA_PRIMARY_KEY_REQUIRED_FOR_DELETE | + HA_NO_TRANSACTIONS /* until fixed by WL#2952 */ | HA_PARTIAL_COLUMN_READ | HA_NULL_IN_KEY); } /* |