diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-12-09 20:19:51 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-12-09 20:19:51 -0700 |
| commit | c082955f0676efe069f30384102ba7807b49dee6 (patch) | |
| tree | cc0a038191d1969182d5dd108c891ee10a436cc0 /sql/sql_handler.cc | |
| parent | 6fd3866c6c104f8bc991d71583e627ae6fabe0ab (diff) | |
| download | mariadb-git-c082955f0676efe069f30384102ba7807b49dee6.tar.gz | |
WL#2360 Performance schema
Part III: mysys instrumentation
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index da5ee93fcb9..b6c399d9908 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -143,14 +143,14 @@ static void mysql_ha_close_table(THD *thd, TABLE_LIST *tables, { (*table_ptr)->file->ha_index_or_rnd_end(); if (! is_locked) - pthread_mutex_lock(&LOCK_open); + mysql_mutex_lock(&LOCK_open); if (close_thread_table(thd, table_ptr)) { /* Tell threads waiting for refresh that something has happened */ broadcast_refresh(); } if (! is_locked) - pthread_mutex_unlock(&LOCK_open); + mysql_mutex_unlock(&LOCK_open); } else if (tables->table) { @@ -775,7 +775,7 @@ void mysql_ha_flush(THD *thd) TABLE_LIST *hash_tables; DBUG_ENTER("mysql_ha_flush"); - safe_mutex_assert_owner(&LOCK_open); + mysql_mutex_assert_owner(&LOCK_open); for (uint i= 0; i < thd->handler_tables_hash.records; i++) { |