diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
| commit | 665100b69dfebe45e2d3b68116c6718560bf63b2 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/sql_rename.cc | |
| parent | 5eed6cc55db0f99aff7845397a824fb2f5ef069e (diff) | |
| parent | 4e8d1c6bf30abfd45a993b058ff2a33d4671b73d (diff) | |
| download | mariadb-git-665100b69dfebe45e2d3b68116c6718560bf63b2.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_rename.cc')
| -rw-r--r-- | sql/sql_rename.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_rename.cc b/sql/sql_rename.cc index 50cd361b174..cf6ab684ead 100644 --- a/sql/sql_rename.cc +++ b/sql/sql_rename.cc @@ -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) |