diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-19 22:25:44 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-19 22:25:44 +0200 |
| commit | 161942e3cefd8923633e0a7b3b7a9860a95f6fbc (patch) | |
| tree | abbee7d78d1399086c301a5bd02f3ba4a9e1ea38 /sql/sql_repl.cc | |
| parent | d7bedeb998c911c921d7b67dc07049955481d9b7 (diff) | |
| parent | 7517a59a6dac4580b1f7b5cf87abf6d75b096bbc (diff) | |
| download | mariadb-git-161942e3cefd8923633e0a7b3b7a9860a95f6fbc.tar.gz | |
Merge with 4.0.12
Docs/internals.texi:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_vio.c:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/key.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
strings/strto.c:
Auto merged
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 63ba519885f..98bbd8bbb98 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -900,22 +900,21 @@ int change_master(THD* thd, MASTER_INFO* mi) if (lex_mi->relay_log_name) { - need_relay_log_purge = 0; - mi->rli.skip_log_purge=1; + need_relay_log_purge= 0; strmake(mi->rli.relay_log_name,lex_mi->relay_log_name, sizeof(mi->rli.relay_log_name)-1); } if (lex_mi->relay_log_pos) { - need_relay_log_purge=0; + need_relay_log_purge= 0; mi->rli.relay_log_pos=lex_mi->relay_log_pos; } flush_master_info(mi); if (need_relay_log_purge) { - mi->rli.skip_log_purge=0; + mi->rli.skip_log_purge= 0; thd->proc_info="purging old relay logs"; if (purge_relay_logs(&mi->rli, thd, 0 /* not only reset, but also reinit */, @@ -929,6 +928,7 @@ int change_master(THD* thd, MASTER_INFO* mi) else { const char* msg; + mi->rli.skip_log_purge= 1; /* Relay log is already initialized */ if (init_relay_log_pos(&mi->rli, mi->rli.relay_log_name, |