diff options
| author | unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org> | 2007-07-20 14:01:37 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org> | 2007-07-20 14:01:37 -0700 |
| commit | b012fca45adaadf00427a2e6761f85f5e8c0af6c (patch) | |
| tree | 9f9c24ffa7c5993c6166c7cebda436f65480c347 /storage/federated | |
| parent | 31611c5dbbd0edfd97f835fcbbf494d053b71cad (diff) | |
| download | mariadb-git-b012fca45adaadf00427a2e6761f85f5e8c0af6c.tar.gz | |
silence two 'unused variable' warnings
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 2c9d692bb5b..67dc37a8ff2 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -3167,7 +3167,6 @@ 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"); /* @@ -3176,6 +3175,8 @@ int ha_federated::external_lock(THD *thd, int lock_type) #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))) { @@ -3228,7 +3229,7 @@ int ha_federated::external_lock(THD *thd, int lock_type) } } #endif /* XXX_SUPERCEDED_BY_WL2952 */ - DBUG_RETURN(0); + DBUG_RETURN(error); } |