diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-22 09:20:20 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-22 09:46:51 +0300 |
commit | 70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd (patch) | |
tree | 14d0c4dba49e36dc0d80c1ba99757b4074781d2d /sql/log_event_old.cc | |
parent | 7edadde72eb23e9110db8cea810c023104e9d15e (diff) | |
parent | 13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (diff) | |
download | mariadb-git-70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'sql/log_event_old.cc')
-rw-r--r-- | sql/log_event_old.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 9ba29ddb0f6..8f1cfe17656 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -1587,7 +1587,7 @@ int Old_rows_log_event::do_apply_event(rpl_group_info *rgi) rli->report(ERROR_LEVEL, thd->net.last_errno, NULL, "Error in %s event: row application failed. %s", get_type_str(), thd->net.last_error); - thd->is_slave_error = 1; + thd->is_slave_error= 1; break; } |