Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.

1 files changed, 6 insertions, 3 deletions

diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 42701bc9e24..c11bd268256 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -176,6 +176,9 @@ a file name for --relay-log-index option", opt_relaylog_index_name);
                         "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
@@ -189,7 +192,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 */
@@ -535,8 +537,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));