Commit 55d1645d authored by Nikita Malyavin's avatar Nikita Malyavin Committed by Sergei Golubchik

MDEV-31059 "Slave SQL" errors upon concurrent DML and erroneous ALTER

Skip more rpl-related error handling.
Also move the error check inside if (table) -- otherwise the error
should be handled already.
parent 3a42f286
...@@ -1364,6 +1364,7 @@ drop table t; ...@@ -1364,6 +1364,7 @@ drop table t;
set debug_sync= reset; set debug_sync= reset;
disconnect con1; disconnect con1;
disconnect con2; disconnect con2;
NOT FOUND /Slave SQL/ in mysqld.1.err
# #
# End of 11.2 tests # End of 11.2 tests
# #
...@@ -1549,6 +1549,9 @@ drop table t; ...@@ -1549,6 +1549,9 @@ drop table t;
set debug_sync= reset; set debug_sync= reset;
--disconnect con1 --disconnect con1
--disconnect con2 --disconnect con2
let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
let SEARCH_PATTERN= Slave SQL;
--source include/search_pattern_in_file.inc
--echo # --echo #
--echo # End of 11.2 tests --echo # End of 11.2 tests
--echo # --echo #
...@@ -5218,11 +5218,11 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi) ...@@ -5218,11 +5218,11 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi)
thd->clear_error(1); thd->clear_error(1);
error= 0; error= 0;
} }
} // if (table)
if (unlikely(error)) if (unlikely(error))
{ {
if (rpl_data.is_online_alter())
goto err;
slave_rows_error_report(ERROR_LEVEL, error, rgi, thd, table, slave_rows_error_report(ERROR_LEVEL, error, rgi, thd, table,
get_type_str(), get_type_str(),
RPL_LOG_NAME, log_pos); RPL_LOG_NAME, log_pos);
...@@ -5238,6 +5238,9 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi) ...@@ -5238,6 +5238,9 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi)
/* remove trigger's tables */ /* remove trigger's tables */
goto err; goto err;
} }
} // if (table)
DBUG_ASSERT(error == 0);
/* /*
Remove trigger's tables. In case of ONLINE ALTER TABLE, event doesn't own Remove trigger's tables. In case of ONLINE ALTER TABLE, event doesn't own
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment