diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-05-03 14:01:11 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-05-03 14:01:11 +0200 |
| commit | 014b8e7f435e495151fe0ef2cfd5e93d1a398ce5 (patch) | |
| tree | b432f6305fe79b126a19fa03124d28a7a2f05cbe /sql/repl_failsafe.cc | |
| parent | d02d52629d2eda10a50079001a79d50bf3d528cd (diff) | |
| download | mariadb-git-014b8e7f435e495151fe0ef2cfd5e93d1a398ce5.tar.gz | |
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
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 9b1b1f70784..99536b68cf6 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -244,7 +244,8 @@ static int find_target_pos(LEX_MASTER_INFO *mi, IO_CACHE *log, char *errmsg) for (;;) { Log_event* ev; - if (!(ev = Log_event::read_log_event(log, (pthread_mutex_t*) 0, 0))) + if (!(ev = Log_event::read_log_event(log, (pthread_mutex_t*) 0, 0, + opt_slave_sql_verify_checksum))) { if (log->error > 0) strmov(errmsg, "Binary log truncated in the middle of event"); @@ -418,7 +419,8 @@ static Slave_log_event* find_slave_event(IO_CACHE* log, for (i = 0; i < 2; i++) { - if (!(ev = Log_event::read_log_event(log, (pthread_mutex_t*)0, 0))) + if (!(ev = Log_event::read_log_event(log, (pthread_mutex_t*)0, 0, + opt_slave_sql_verify_checksum))) { my_snprintf(errmsg, SLAVE_ERRMSG_SIZE, "Error reading event in log '%s'", |