diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 09:35:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 09:57:17 +0200 |
| commit | 34841d2305b6bbe2c0b496add905b1dd478dafbe (patch) | |
| tree | 85b31de5caf44a9024d73e41fbdbdadb29ff5526 /sql/sql_repl.cc | |
| parent | 62eaf7b657fd25bb4457049c81fb929314d6eb1d (diff) | |
| parent | a285e68018018ef3959f6381aa61347b73902997 (diff) | |
| download | mariadb-git-34841d2305b6bbe2c0b496add905b1dd478dafbe.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index d978a2d58ee..08e9dcf3fe6 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -3344,7 +3344,7 @@ void kill_zombie_dump_threads(uint32 slave_server_id) if (tmp->get_command() == COM_BINLOG_DUMP && tmp->variables.server_id == slave_server_id) { - mysql_mutex_lock(&tmp->LOCK_thd_data); // Lock from delete + mysql_mutex_lock(&tmp->LOCK_thd_kill); // Lock from delete break; } } @@ -3356,8 +3356,8 @@ void kill_zombie_dump_threads(uint32 slave_server_id) it will be slow because it will iterate through the list again. We just to do kill the thread ourselves. */ - tmp->awake(KILL_SLAVE_SAME_ID); - mysql_mutex_unlock(&tmp->LOCK_thd_data); + tmp->awake_no_mutex(KILL_SLAVE_SAME_ID); + mysql_mutex_unlock(&tmp->LOCK_thd_kill); } } |