From f11418f76f54614ad3dcc82da4172195667663f0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 28 Jul 2005 21:39:24 +0300 Subject: After merge fixes mysql-test/r/func_group.result: Update results after merge (things moved around when aligning 4.1 and 5.0 tests) mysql-test/r/mysqldump.result: Update results after merge (things moved around when aligning 4.1 and 5.0 tests) mysql-test/r/ps_grant.result: Update results after merge (test moved to another file) mysql-test/t/mysqldump.test: Align with other lines sql/lock.cc: Removed compiler warning Fixed typo during merge --- sql/lock.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sql/lock.cc') diff --git a/sql/lock.cc b/sql/lock.cc index 377b2b6ba26..d51d9083058 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -99,14 +99,15 @@ static void print_lock_error(int error, const char *); NULL on error. */ +static int thr_lock_errno_to_mysql[]= +{ 0, 1, ER_LOCK_WAIT_TIMEOUT, ER_LOCK_DEADLOCK }; + MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, uint flags) { MYSQL_LOCK *sql_lock; TABLE *write_lock_used; int rc; /* Map the return value of thr_lock to an error from errmsg.txt */ - const static int thr_lock_errno_to_mysql[]= - { 0, 1, ER_LOCK_WAIT_TIMEOUT, ER_LOCK_DEADLOCK }; DBUG_ENTER("mysql_lock_tables"); for (;;) @@ -624,8 +625,8 @@ int lock_table_name(THD *thd, TABLE_LIST *table_list) } /* Return 1 if table is in use */ - DBUG_RETURN(test(remove_table_from_cache(thd, db, table_list->real_name, - RTFC_NO_FLAG))) + DBUG_RETURN(test(remove_table_from_cache(thd, db, table_list->table_name, + RTFC_NO_FLAG))); } -- cgit v1.2.1