diff options
author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-02-05 10:09:31 +0400 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2007-02-05 10:09:31 +0400 |
commit | cbace0b7b46b5515ee92ee5313d4a98b6e0232d9 (patch) | |
tree | eeedda3a1ffafd7df2c7ac6da60a7a277c14a243 /sql/slave.cc | |
parent | a4f74b8664a1205594f5eddd4a4b7c8985a7e4c7 (diff) | |
parent | f27ea1b1524ff8a38728c0886d5e15bc4dcfffee (diff) | |
download | mariadb-git-cbace0b7b46b5515ee92ee5313d4a98b6e0232d9.tar.gz |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
-rw-r--r-- | sql/slave.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b77d154a08f..5ff05046895 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4836,7 +4836,13 @@ Log_event* next_event(RELAY_LOG_INFO* rli) hot_log=0; // Using old binary log } } - + /* + As there is no guarantee that the relay is open (for example, an I/O + error during a write by the slave I/O thread may have closed it), we + have to test it. + */ + if (!my_b_inited(cur_log)) + goto err; #ifndef DBUG_OFF { /* This is an assertion which sometimes fails, let's try to track it */ |