diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-30 17:18:24 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-30 17:18:24 +0200 |
| commit | 051015f878d82fb2b397189bca607dd492773055 (patch) | |
| tree | 97afe7602e78916604ca05a2f3a56d51833831f2 | |
| parent | b2a102fb584e55a5c07c25a1caa9575fe1732c14 (diff) | |
| download | mariadb-git-bb-10.3-vicentiu-travis.tar.gz | |
Tentative fix for travisbb-10.3-vicentiu-travis
This undoes a lock-unlock for LOCK_thread_count.
| -rw-r--r-- | sql/log.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index bdf0b6fdc59..fc4b961e136 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -4178,6 +4178,7 @@ bool MYSQL_BIN_LOG::reset_logs(THD *thd, bool create_new_log, mysql_mutex_unlock(&LOCK_xid_list); } + mysql_mutex_lock(&LOCK_thread_count); /* Save variables so that we can reopen the log */ save_name=name; name=0; // Protect against free @@ -4285,6 +4286,8 @@ err: if (error == 1) name= const_cast<char*>(save_name); + mysql_mutex_unlock(&LOCK_thread_count); + if (!is_relay_log) { xid_count_per_binlog *b; |