diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-04-18 18:51:10 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-04-18 18:51:10 -0600 |
| commit | b713fd90d468f9daac4ac2be13e3be2e5d6a571d (patch) | |
| tree | 0cd3b54dd83cf460b3bd0974e9cbcea2f935f426 /sql | |
| parent | 8a20bc123ba9346138f4a6c96d4f66db22e6f1d4 (diff) | |
| parent | 6ad7b4bbf5f070263b05f87ece4dd48f9b914849 (diff) | |
| download | mariadb-git-b713fd90d468f9daac4ac2be13e3be2e5d6a571d.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
Diffstat (limited to 'sql')
| -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 045ba57d8c7..930155206c2 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1115,6 +1115,7 @@ static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo) static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli) { bool slave_killed; + LINT_INIT(slave_killed); MASTER_INFO* mi = rli->mi; const char* save_proc_info; THD* thd = mi->io_thd; @@ -2579,6 +2580,7 @@ Log_event* next_event(RELAY_LOG_INFO* rli) goto err; } rli->relay_log_pos = 4; + rli->pending=0; strnmov(rli->relay_log_name,rli->linfo.log_file_name, sizeof(rli->relay_log_name)); flush_relay_log_info(rli); |