Commit e9963041 authored by Nirbhay Choubey's avatar Nirbhay Choubey

MDEV-8617: Multiple galera tests failures with --ps-protocol

(Additional fixes in 10.0-galera branch)
* Reset THD's PS members before returning when node is
not ready.
* Update galera_suspend_slave.test
parent 8a18bb96
...@@ -30,7 +30,7 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; ...@@ -30,7 +30,7 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
exit(0); exit(0);
EOF EOF
--error ER_UNKNOWN_COM_ERROR,ER_LOCK_WAIT_TIMEOUT --error ER_UNKNOWN_COM_ERROR,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
--echo Resuming node_2 ... --echo Resuming node_2 ...
......
...@@ -1075,6 +1075,12 @@ bool do_command(THD *thd) ...@@ -1075,6 +1075,12 @@ bool do_command(THD *thd)
"WSREP has not yet prepared node for application use", "WSREP has not yet prepared node for application use",
MYF(0)); MYF(0));
thd->protocol->end_statement(); thd->protocol->end_statement();
/* Performance Schema Interface instrumentation end */
MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
thd->m_statement_psi= NULL;
thd->m_digest= NULL;
return_value= FALSE; return_value= FALSE;
goto out; goto out;
} }
......
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