diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-29 15:16:40 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-29 15:16:40 -0700 |
| commit | 6987f146cda13f6b817e4fca105c51beca9d4c9c (patch) | |
| tree | 72ba5df99e480901d61ed532e1557c09f85f2c69 /sql | |
| parent | 5b968bb8ee49008e8adfba898472b20b0cf0524f (diff) | |
| parent | 9330f85b35b734a9b19db2f390c6340add5d976d (diff) | |
| download | mariadb-git-6987f146cda13f6b817e4fca105c51beca9d4c9c.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 16c6751f853..44b11c5e5f6 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2010,7 +2010,7 @@ static int queue_old_event(MASTER_INFO *mi, const char *buf, mi->master_log_pos += event_len; if (unlikely(processed_stop_event)) mi->ignore_stop_event=1; - pthread_mutex_lock(&mi->data_lock); + pthread_mutex_unlock(&mi->data_lock); return 0; } |