diff options
| author | lars@mysql.com <> | 2005-07-13 02:13:04 +0200 |
|---|---|---|
| committer | lars@mysql.com <> | 2005-07-13 02:13:04 +0200 |
| commit | 6db2602ad06b0e1ac483809df0c1fbe471634f3d (patch) | |
| tree | 288cefd45b67649d427ee7a8a02969119055a4a4 /sql/slave.cc | |
| parent | f19814bea652be03645820ac9ebac173c4118b85 (diff) | |
| parent | c31d71c065304b7cd1c237174da19a8d4270fb26 (diff) | |
| download | mariadb-git-6db2602ad06b0e1ac483809df0c1fbe471634f3d.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/mysql-5.0
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index c6c0de7160b..33f27064aab 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4968,6 +4968,7 @@ 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 @@ -4997,6 +4998,7 @@ 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; } |