bk commit into 5.1 tree (kostja:1.2531)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-14 05:22:24+04:00, kostja@bodhi.(none) +1 -0
  Fix a compiler warning.

  sql/sql_trigger.cc@stripped, 2007-07-14 05:22:22+04:00, kostja@bodhi.(none) +4 -4
    Fix a compiler warning.

diff -Nrup a/sql/sql_trigger.cc b/sql/sql_trigger.cc
--- a/sql/sql_trigger.cc	2007-07-02 23:00:12 +04:00
+++ b/sql/sql_trigger.cc	2007-07-14 05:22:22 +04:00
@@ -1805,16 +1805,16 @@ bool Table_triggers_list::change_table_n
   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