diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
| commit | 6b31e63177e0c16d92e460302bae9b2c92c8f500 (patch) | |
| tree | d206f4c8848a50899d8d0656e8c8212189365ace /sql/sql_trigger.cc | |
| parent | f4e7c093726a0143fd734b588c10e2b7780fe9ab (diff) | |
| parent | 3251e4549c7541557546d0550ddfafa1574fe5ce (diff) | |
| download | mariadb-git-6b31e63177e0c16d92e460302bae9b2c92c8f500.tar.gz | |
5.1 -> 5.2 merge
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index fb9abc06f6b..13cb9f22e9a 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1982,9 +1982,7 @@ bool Table_triggers_list::change_table_name(THD *thd, const char *db, */ #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; - + uint key_length= create_table_def_key((char *)key, db, old_table); if (!is_table_name_exclusively_locked_by_this_thread(thd, key, key_length)) safe_mutex_assert_owner(&LOCK_open); #endif |