diff options
| author | monty@mysql.com <> | 2005-10-13 20:18:37 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-13 20:18:37 +0300 |
| commit | 6f5baa1ebab0a71e87acb9fc19614b34a22513cd (patch) | |
| tree | a7f6f0a949d99ffafb00035024e83f0c62853199 /sql/slave.cc | |
| parent | 1436494a72e772a3a0e057078003947b5f7bec8a (diff) | |
| parent | 829a4831b1054a769ed34e111ab88be0619aa06e (diff) | |
| download | mariadb-git-6f5baa1ebab0a71e87acb9fc19614b34a22513cd.tar.gz | |
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 15a70b788e6..3e3a02a7c21 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4844,7 +4844,8 @@ Log_event* next_event(RELAY_LOG_INFO* rli) time_t save_timestamp= rli->last_master_timestamp; rli->last_master_timestamp= 0; - DBUG_ASSERT(rli->relay_log.get_open_count() == rli->cur_log_old_open_count); + DBUG_ASSERT(rli->relay_log.get_open_count() == + rli->cur_log_old_open_count); if (rli->ign_master_log_name_end[0]) { @@ -4854,13 +4855,13 @@ Log_event* next_event(RELAY_LOG_INFO* rli) 0, rli->ign_master_log_pos_end, Rotate_log_event::DUP_NAME); rli->ign_master_log_name_end[0]= 0; + pthread_mutex_unlock(log_lock); if (unlikely(!ev)) { errmsg= "Slave SQL thread failed to create a Rotate event " "(out of memory?), SHOW SLAVE STATUS may be inaccurate"; goto err; } - pthread_mutex_unlock(log_lock); ev->server_id= 0; // don't be ignored by slave SQL thread DBUG_RETURN(ev); } |