diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-14 01:31:38 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-14 01:31:38 -0400 |
| commit | e996304189999eae8aeaa6995a80bf486833ed87 (patch) | |
| tree | 738bd6109bd472ffd78d30e3f33b259718e741f9 | |
| parent | 8a18bb969432242b7431231ff9cd1fb6fc8a707f (diff) | |
| download | mariadb-git-e996304189999eae8aeaa6995a80bf486833ed87.tar.gz | |
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
| -rw-r--r-- | mysql-test/suite/galera/t/galera_suspend_slave.test | 2 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/t/galera_suspend_slave.test b/mysql-test/suite/galera/t/galera_suspend_slave.test index ac3fdf0ef40..236c65b73a7 100644 --- a/mysql-test/suite/galera/t/galera_suspend_slave.test +++ b/mysql-test/suite/galera/t/galera_suspend_slave.test @@ -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 ... diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7643179b4c8..42ad69d84ec 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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; } |