database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge next-mr -> next-4284.

Browse Source
This commit is contained in:
Konstantin Osipov
2010-02-02 02:22:16 +03:00
parent 5eed6cc55d 4e8d1c6bf3
commit 665100b69d
311 changed files with 7149 additions and 2702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_rename.cc
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000-2006 MySQL AB
/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -136,7 +136,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
if (lock_table_names(thd, table_list))
goto err;
pthread_mutex_lock(&LOCK_open);
mysql_mutex_lock(&LOCK_open);
for (ren_table= table_list; ren_table; ren_table= ren_table->next_local)
tdc_remove_table(thd, TDC_RT_REMOVE_ALL, ren_table->db,
@ -174,7 +174,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent)
higher concurrency - query_cache_invalidate can take minutes to
complete.
*/
pthread_mutex_unlock(&LOCK_open);
mysql_mutex_unlock(&LOCK_open);
/* Lets hope this doesn't fail as the result will be messy */
if (!silent && !error)