diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-14 12:00:08 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-14 12:00:08 +0300 |
| commit | a6165accb3279fe64b672fa0eeaa30ef12cf6557 (patch) | |
| tree | ab2b90f11bcd60035fe1b57f6779dc30f9207360 /sql/log.cc | |
| parent | 50561ab0108dcb427ba0975f11dcab3e20b05612 (diff) | |
| parent | 253d7f25010552a97b603ed5129e3abd5b966426 (diff) | |
| download | mariadb-git-a6165accb3279fe64b672fa0eeaa30ef12cf6557.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 3680398f068..7776b6bfbdc 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3075,7 +3075,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD* thd) thread. If the transaction involved MyISAM tables, it should go into binlog even on rollback. */ - pthread_mutex_lock(&LOCK_thread_count); + mysql_mutex_lock(&LOCK_thread_count); /* Save variables so that we can reopen the log */ save_name=name; @@ -3168,7 +3168,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD* thd) err: if (error == 1) name= const_cast<char*>(save_name); - pthread_mutex_unlock(&LOCK_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); mysql_mutex_unlock(&LOCK_index); mysql_mutex_unlock(&LOCK_log); DBUG_RETURN(error); |