diff options
| author | lars@mysql.com <> | 2005-07-13 04:00:55 +0200 |
|---|---|---|
| committer | lars@mysql.com <> | 2005-07-13 04:00:55 +0200 |
| commit | 30b76e5d78ad265a55e4977abcb9ed289cc1235d (patch) | |
| tree | e7b1c04fd9fdf3fde25c4bf440cc8cfa957411d5 /sql/slave.cc | |
| parent | ca2e52a34f4dee4e2c3025016aef02ab1f5794a8 (diff) | |
| download | mariadb-git-30b76e5d78ad265a55e4977abcb9ed289cc1235d.tar.gz | |
Manual merge
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 33f27064aab..c6c0de7160b 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4968,7 +4968,6 @@ void rotate_relay_log(MASTER_INFO* mi) /* We don't lock rli->run_lock. This would lead to deadlocks. */ pthread_mutex_lock(&mi->run_lock); - pthread_mutex_lock(&mi->data_lock); /* We need to test inited because otherwise, new_file() will attempt to lock @@ -4998,7 +4997,6 @@ void rotate_relay_log(MASTER_INFO* mi) */ rli->relay_log.harvest_bytes_written(&rli->log_space_total); end: - pthread_mutex_unlock(&mi->data_lock); pthread_mutex_unlock(&mi->run_lock); DBUG_VOID_RETURN; } |