diff options
| author | Venkatesh Venugopal <venkatesh.venugopal@oracle.com> | 2019-04-25 18:01:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-25 18:03:00 +0200 |
| commit | ae1b8b9bf5d3e4b49d325be2e6cac74700e35e69 (patch) | |
| tree | 8599f50e2debdc7f3732e70349c294f91a3933df /sql/log_event_old.cc | |
| parent | 2be3ab977631085dff93f583cab91dc0b8c2178d (diff) | |
| download | mariadb-git-ae1b8b9bf5d3e4b49d325be2e6cac74700e35e69.tar.gz | |
Problem
-------
MySQL abnormally exits on KILL command.
Fix
---
The abnormal exit has been fixed.
RB: 20971, 21129, 21237
Diffstat (limited to 'sql/log_event_old.cc')
| -rw-r--r-- | sql/log_event_old.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 3d54ffdf7eb..55de64ce73c 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2007, 2018, Oracle and/or its affiliates. - Copyright (c) 2009, 2018, MariaDB +/* Copyright (c) 2007, 2019, Oracle and/or its affiliates. + Copyright (c) 2009, 2019, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -100,21 +100,20 @@ Old_rows_log_event::do_apply_event(Old_rows_log_event *ev, const Relay_log_info if (open_and_lock_tables(ev_thd, rli->tables_to_lock, FALSE, 0)) { - uint actual_error= ev_thd->stmt_da->sql_errno(); - if (ev_thd->is_slave_error || ev_thd->is_fatal_error) + if (ev_thd->is_error()) { /* Error reporting borrowed from Query_log_event with many excessive - simplifications (we don't honour --slave-skip-errors) + simplifications. + We should not honour --slave-skip-errors at this point as we are + having severe errors which should not be skipped. */ - rli->report(ERROR_LEVEL, actual_error, + rli->report(ERROR_LEVEL, ev_thd->stmt_da->sql_errno(), "Error '%s' on opening tables", - (actual_error ? ev_thd->stmt_da->message() : - "unexpected success or fatal error")); + ev_thd->stmt_da->message()); ev_thd->is_slave_error= 1; } - const_cast<Relay_log_info*>(rli)->slave_close_thread_tables(thd); - DBUG_RETURN(actual_error); + DBUG_RETURN(1); } /* |