1
0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00

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
This commit is contained in:
Nirbhay Choubey
2015-08-14 01:31:38 -04:00
parent 8a18bb9694
commit e996304189
2 changed files with 7 additions and 1 deletions

View File

@@ -30,7 +30,7 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
exit(0);
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);
--echo Resuming node_2 ...

View File

@@ -1075,6 +1075,12 @@ bool do_command(THD *thd)
"WSREP has not yet prepared node for application use",
MYF(0));
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;
goto out;
}