diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2009-07-24 21:04:55 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2009-07-24 21:04:55 +0500 |
| commit | 2bc6b6a80099ddb5b57e3d3c8be120e6596daa08 (patch) | |
| tree | 999d090b1f7c4cb9c23b5e41592e0cec56389c5f /sql/sql_repl.cc | |
| parent | c24cccabdda8fad2117e3dea39e4de3c7feb3157 (diff) | |
| parent | dc0a87fdc24ed0859856d243ad68a0c1913db3af (diff) | |
| download | mariadb-git-2bc6b6a80099ddb5b57e3d3c8be120e6596daa08.tar.gz | |
Merge from 5.0
******
manual merge 5.0-bugteam --> 5.1-bugteam (bug 38816)
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 476c8aaaefb..0ec8d91214c 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1102,7 +1102,7 @@ void kill_zombie_dump_threads(uint32 slave_server_id) if (tmp->command == COM_BINLOG_DUMP && tmp->server_id == slave_server_id) { - pthread_mutex_lock(&tmp->LOCK_delete); // Lock from delete + pthread_mutex_lock(&tmp->LOCK_thd_data); // Lock from delete break; } } @@ -1115,7 +1115,7 @@ void kill_zombie_dump_threads(uint32 slave_server_id) again. We just to do kill the thread ourselves. */ tmp->awake(THD::KILL_QUERY); - pthread_mutex_unlock(&tmp->LOCK_delete); + pthread_mutex_unlock(&tmp->LOCK_thd_data); } } |