diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-20 10:45:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-20 11:10:27 +0200 |
| commit | bb24663f5ad955a615172512c04779d219bb6645 (patch) | |
| tree | 63e9c3c6bc1026e9853f3d766d208899c3cfdae9 /sql/handler.cc | |
| parent | 44682962e3fe591d16c6fa966c39e9c738427712 (diff) | |
| download | mariadb-git-bb24663f5ad955a615172512c04779d219bb6645.tar.gz | |
MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specific temporary errors
Revert 7bbe324fc17
Fix the bug differently (in log_event.cc)
Fix the test case to actually fail without the bug fix
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 1027a8b102d..35b0814ef79 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3639,13 +3639,10 @@ void handler::print_error(int error, myf errflag) if ((debug_assert_if_crashed_table || global_system_variables.log_warnings > 1)) { - THD *thd= ha_thd(); /* Log error to log before we crash or if extended warnings are requested */ errflag|= ME_NOREFRESH; - if (thd && thd->is_optimistic_slave_worker()) - errflag|= ME_LOG_AS_WARN; } } |