From 014b8e7f435e495151fe0ef2cfd5e93d1a398ce5 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 3 May 2011 14:01:11 +0200 Subject: Backport MySQL WL#2540 into MariaDB. Patch backported: bzr diff '-rrevid:alfranio.correia@oracle.com-20101121143257-se3vpqus73l4mum0 ..revid:luis.soares@oracle.com-20101124111752-9b8260bd1qak87hr' --old=lp:mysql-server --new=lp:mysql-server --- sql/rpl_rli.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'sql/rpl_rli.cc') diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index a2d0b1e4904..0886fd02004 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -175,6 +175,9 @@ a file name for --relay-log-index option", opt_relaylog_index_name); "use '--relay-log=%s' to avoid this problem.", ln); name_warning_sent= 1; } + + rli->relay_log.is_relay_log= TRUE; + /* note, that if open() fails, we'll still have index file open but a destructor will take care of that @@ -188,7 +191,6 @@ a file name for --relay-log-index option", opt_relaylog_index_name); sql_print_error("Failed in open_log() called from init_relay_log_info()"); DBUG_RETURN(1); } - rli->relay_log.is_relay_log= TRUE; } /* if file does not exist */ @@ -534,8 +536,9 @@ int init_relay_log_pos(Relay_log_info* rli,const char* log, Because of we have rli->data_lock and log_lock, we can safely read an event */ - if (!(ev=Log_event::read_log_event(rli->cur_log,0, - rli->relay_log.description_event_for_exec))) + if (!(ev= Log_event::read_log_event(rli->cur_log, 0, + rli->relay_log.description_event_for_exec, + opt_slave_sql_verify_checksum))) { DBUG_PRINT("info",("could not read event, rli->cur_log->error=%d", rli->cur_log->error)); -- cgit v1.2.1