summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkostja@bodhi.(none) <>2007-07-14 05:22:24 +0400
committerkostja@bodhi.(none) <>2007-07-14 05:22:24 +0400
commit9e7f70023c97967ff4ba6e9dcc77f24587589bd3 (patch)
tree69767c36c1bf087459fa815da3874567530e1497
parent74e4fccbbca400e56f7617a9ba67b7a11d0571f4 (diff)
downloadmariadb-git-9e7f70023c97967ff4ba6e9dcc77f24587589bd3.tar.gz
Fix a compiler warning.
-rw-r--r--sql/sql_trigger.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index b5165a29ab4..55eae2f5ea5 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -1805,16 +1805,16 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db,
bzero(&table, sizeof(table));
init_alloc_root(&table.mem_root, 8192, 0);
- uchar key[MAX_DBKEY_LENGTH];
- uint key_length= (uint) (strmov(strmov((char*)&key[0], db)+1,
- old_table)-(char*)&key[0])+1;
-
/*
This method interfaces the mysql server code protected by
either LOCK_open mutex or with an exclusive table name lock.
In the future, only an exclusive table name lock will be enough.
*/
#ifndef DBUG_OFF
+ uchar key[MAX_DBKEY_LENGTH];
+ uint key_length= (uint) (strmov(strmov((char*)&key[0], db)+1,
+ old_table)-(char*)&key[0])+1;
+
if (!is_table_name_exclusively_locked_by_this_thread(thd, key, key_length))
safe_mutex_assert_owner(&LOCK_open);
#endif