database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge mysql-next-mr --> mysql-5.1-rpl-merge

Browse Source 
Conflicts:
  Text conflict in sql/sql_insert.cc
This commit is contained in:
Alfranio Correia
2010-01-14 16:02:55 +00:00
parent 0f90f1dee7 9c820e637e
commit fb0ee3ab8e
286 changed files with 27080 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/log.cc
View File

@ -3213,7 +3213,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;
@ -3306,7 +3306,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);