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 | 2c6015e8dc962bef8f353af920581d9b6bd7fd82 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/sql_handler.cc | |
| parent | ca2b08e437d4c5538b40aa61fa44f68ddd74bc42 (diff) | |
| parent | 92630be0ee81604ec47cb8c7e9ab016e5449dc4d (diff) | |
| download | mariadb-git-2c6015e8dc962bef8f353af920581d9b6bd7fd82.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 5f800ea8642..4b22d5e8eec 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -1,4 +1,5 @@ -/* Copyright (C) 2000-2004 MySQL AB +/* Copyright (C) 2000-2004 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 the Free Software Foundation; version 2 of the License. @@ -123,13 +124,13 @@ static void mysql_ha_close_table(THD *thd, TABLE_LIST *tables) { /* Non temporary table. */ tables->table->file->ha_index_or_rnd_end(); - pthread_mutex_lock(&LOCK_open); + mysql_mutex_lock(&LOCK_open); if (close_thread_table(thd, &tables->table)) { /* Tell threads waiting for refresh that something has happened */ broadcast_refresh(); } - pthread_mutex_unlock(&LOCK_open); + mysql_mutex_unlock(&LOCK_open); thd->mdl_context.release_lock(tables->mdl_request.ticket); } else if (tables->table) @@ -774,7 +775,7 @@ void mysql_ha_flush(THD *thd) TABLE_LIST *hash_tables; DBUG_ENTER("mysql_ha_flush"); - safe_mutex_assert_not_owner(&LOCK_open); + mysql_mutex_assert_not_owner(&LOCK_open); /* Don't try to flush open HANDLERs when we're working with |