Commit 051015f8 authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru

Tentative fix for travis

This undoes a lock-unlock for LOCK_thread_count.
parent b2a102fb
...@@ -4178,6 +4178,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD *thd, bool create_new_log, ...@@ -4178,6 +4178,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD *thd, bool create_new_log,
mysql_mutex_unlock(&LOCK_xid_list); mysql_mutex_unlock(&LOCK_xid_list);
} }
mysql_mutex_lock(&LOCK_thread_count);
/* Save variables so that we can reopen the log */ /* Save variables so that we can reopen the log */
save_name=name; save_name=name;
name=0; // Protect against free name=0; // Protect against free
...@@ -4285,6 +4286,8 @@ bool MYSQL_BIN_LOG::reset_logs(THD *thd, bool create_new_log, ...@@ -4285,6 +4286,8 @@ bool MYSQL_BIN_LOG::reset_logs(THD *thd, bool create_new_log,
if (error == 1) if (error == 1)
name= const_cast<char*>(save_name); name= const_cast<char*>(save_name);
mysql_mutex_unlock(&LOCK_thread_count);
if (!is_relay_log) if (!is_relay_log)
{ {
xid_count_per_binlog *b; xid_count_per_binlog *b;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment