Commit 0304dbc3 authored by Jan Lindström's avatar Jan Lindström Committed by Julius Goryavsky

MDEV-25089 : Assertion `error.len > 0' failed in galera::ReplicatorSMM::handle_apply_error()

Additional corrections after merge from 10.4 branch
Signed-off-by: default avatarJulius Goryavsky <julius.goryavsky@mariadb.com>
parent 9fb8881e
...@@ -18,7 +18,6 @@ galera_concurrent_ctas : MDEV-32779 galera_concurrent_ctas: assertion in the gal ...@@ -18,7 +18,6 @@ galera_concurrent_ctas : MDEV-32779 galera_concurrent_ctas: assertion in the gal
galera_as_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback() galera_as_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback()
galera_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback() galera_slave_replay : MDEV-32780 galera_as_slave_replay: assertion in the wsrep::transaction::before_rollback()
galera_sst_mysqldump_with_key : MDEV-32782 galera_sst_mysqldump_with_key test failed galera_sst_mysqldump_with_key : MDEV-32782 galera_sst_mysqldump_with_key test failed
mdev-31285 : MDEV-25089 Assertion `error.len > 0' failed in galera::ReplicatorSMM::handle_apply_error()
galera_var_ignore_apply_errors : MENT-1997 galera_var_ignore_apply_errors test freezes galera_var_ignore_apply_errors : MENT-1997 galera_var_ignore_apply_errors test freezes
MDEV-22232 : temporarily disabled at the request of Codership MDEV-22232 : temporarily disabled at the request of Codership
MW-402 : temporarily disabled at the request of Codership MW-402 : temporarily disabled at the request of Codership
......
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/force_restart.inc # ARCHIVE plugin must be uninstalled
if (!$HA_ARCHIVE_SO) { if (!$HA_ARCHIVE_SO) {
skip Needs Archive loadable plugin; skip Needs Archive loadable plugin;
......
...@@ -10294,14 +10294,14 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db, ...@@ -10294,14 +10294,14 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
if we can support implementing storage engine. if we can support implementing storage engine.
*/ */
if (WSREP(thd) && table && table->s->sequence && if (WSREP(thd) && table && table->s->sequence &&
wsrep_check_sequence(thd, thd->lex->create_info.seq_create_info, used_engine)) wsrep_check_sequence(thd, create_info->seq_create_info, used_engine))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
if (WSREP(thd) && if (WSREP(thd) && table &&
(thd->lex->sql_command == SQLCOM_ALTER_TABLE || (thd->lex->sql_command == SQLCOM_ALTER_TABLE ||
thd->lex->sql_command == SQLCOM_CREATE_INDEX || thd->lex->sql_command == SQLCOM_CREATE_INDEX ||
thd->lex->sql_command == SQLCOM_DROP_INDEX) && thd->lex->sql_command == SQLCOM_DROP_INDEX) &&
!wsrep_should_replicate_ddl(thd, table_list->table->s->db_type()->db_type)) !wsrep_should_replicate_ddl(thd, table->s->db_type()->db_type))
DBUG_RETURN(true); DBUG_RETURN(true);
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
...@@ -12539,10 +12539,8 @@ bool Sql_cmd_create_table_like::execute(THD *thd) ...@@ -12539,10 +12539,8 @@ bool Sql_cmd_create_table_like::execute(THD *thd)
wsrep_check_sequence(thd, lex->create_info.seq_create_info, used_engine)) wsrep_check_sequence(thd, lex->create_info.seq_create_info, used_engine))
DBUG_RETURN(true); DBUG_RETURN(true);
WSREP_TO_ISOLATION_BEGIN_ALTER(create_table->db.str, WSREP_TO_ISOLATION_BEGIN_ALTER(create_table->db.str, create_table->table_name.str,
create_table->table_name.str, first_table, &alter_info, NULL, &create_info)
first_table, &alter_info, NULL,
&create_info)
{ {
WSREP_WARN("CREATE TABLE isolation failure"); WSREP_WARN("CREATE TABLE isolation failure");
res= true; res= true;
......
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