database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-12 20:49:12 +03:00
Code Activity

silence two 'unused variable' warnings

Browse Source
This commit is contained in:
unknown
2007-07-20 14:01:37 -07:00
parent 31611c5dbb
commit b012fca45a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/federated/ha_federated.cc
View File

@@ -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 ha_federated::external_lock(THD *thd, int lock_type)
{ {
int error= 0; int error= 0;
ha_federated *trx= (ha_federated *)thd->ha_data[ht->slot];
DBUG_ENTER("ha_federated::external_lock"); 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 #ifdef XXX_SUPERCEDED_BY_WL2952
if (lock_type != F_UNLCK) if (lock_type != F_UNLCK)
{ {
ha_federated *trx= (ha_federated *)thd->ha_data[ht->slot];
DBUG_PRINT("info",("federated not lock F_UNLCK")); DBUG_PRINT("info",("federated not lock F_UNLCK"));
if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) 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 */ #endif /* XXX_SUPERCEDED_BY_WL2952 */
DBUG_RETURN(0); DBUG_RETURN(error);
} }