Commit 9e7f7002 authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)

Fix a compiler warning.

parent 74e4fccb
...@@ -1805,16 +1805,16 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db, ...@@ -1805,16 +1805,16 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db,
bzero(&table, sizeof(table)); bzero(&table, sizeof(table));
init_alloc_root(&table.mem_root, 8192, 0); 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 This method interfaces the mysql server code protected by
either LOCK_open mutex or with an exclusive table name lock. either LOCK_open mutex or with an exclusive table name lock.
In the future, only an exclusive table name lock will be enough. In the future, only an exclusive table name lock will be enough.
*/ */
#ifndef DBUG_OFF #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)) if (!is_table_name_exclusively_locked_by_this_thread(thd, key, key_length))
safe_mutex_assert_owner(&LOCK_open); safe_mutex_assert_owner(&LOCK_open);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment