Refs: MW-245 - Adjust tests to account for the new behavior.

MariaDB · Mar 20, 2018 · 33028f7 · 33028f7
1 parent 9a89614
commit 33028f7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/mysql-test/suite/galera/r/galera_var_dirty_reads.result b/mysql-test/suite/galera/r/galera_var_dirty_reads.result
@@ -30,9 +30,9 @@ SET @@session.wsrep_dirty_reads=OFF;
 SELECT i, variable_name, variable_value FROM t1, information_schema.session_variables WHERE variable_name LIKE "wsrep_dirty_reads" AND i = 1;
 ERROR 08S01: WSREP has not yet prepared node for application use
 SELECT 1;
-1
-1
+ERROR 08S01: WSREP has not yet prepared node for application use
 USE information_schema;
+ERROR 08S01: WSREP has not yet prepared node for application use
 SELECT * FROM information_schema.session_variables WHERE variable_name LIKE "wsrep_dirty_reads";
 VARIABLE_NAME	VARIABLE_VALUE
 WSREP_DIRTY_READS	OFF

diff --git a/mysql-test/suite/galera/r/galera_var_reject_queries.result b/mysql-test/suite/galera/r/galera_var_reject_queries.result
@@ -7,7 +7,7 @@ ERROR 08S01: WSREP has not yet prepared node for application use
 SET GLOBAL wsrep_reject_queries = ALL_KILL;
 ERROR HY000: Lost connection to MySQL server during query
 SELECT * FROM t1;
-ERROR 70100: Connection was killed
+Got one of the listed errors
 SELECT * FROM t1;
 ERROR 08S01: WSREP has not yet prepared node for application use
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';

diff --git a/mysql-test/suite/galera/t/galera_as_slave_nonprim.test b/mysql-test/suite/galera/t/galera_as_slave_nonprim.test
@@ -51,7 +51,7 @@ INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
 --let $value = query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1)
 --connection node_3
 --disable_query_log
---eval SELECT "$value" IN ("Error 'Unknown command' on query. Default database: 'test'. Query: 'BEGIN'", "Node has dropped from cluster") AS expected_error
+--eval SELECT "$value" IN ("Error 'WSREP has not yet prepared node for application use' on query. Default database: 'test'. Query: 'BEGIN'", "Node has dropped from cluster") AS expected_error
 --enable_query_log
 
 # Step #4. Bring back the async slave and restart replication
@@ -85,8 +85,9 @@ DROP TABLE t1;
 STOP SLAVE;
 RESET SLAVE ALL;
 
-CALL mtr.add_suppression("Slave SQL: Error 'Unknown command' on query");
-CALL mtr.add_suppression("Slave: Unknown command Error_code: 1047");
+CALL mtr.add_suppression("Slave SQL: Error 'WSREP has not yet prepared node for application use' on query");
+CALL mtr.add_suppression("Slave: WSREP has not yet prepared node for application use Error_code: 1047");
+CALL mtr.add_suppression("TORDERED} returned -107 \\(Transport endpoint is not connected\\)");
 CALL mtr.add_suppression("Transport endpoint is not connected");
 CALL mtr.add_suppression("Slave SQL: Error in Xid_log_event: Commit could not be completed, 'Deadlock found when trying to get lock; try restarting transaction', Error_code: 1213");
 CALL mtr.add_suppression("Slave SQL: Node has dropped from cluster, Error_code: 1047");

diff --git a/mysql-test/suite/galera/t/galera_var_dirty_reads.test b/mysql-test/suite/galera/t/galera_var_dirty_reads.test
@@ -47,8 +47,10 @@ SET @@session.wsrep_dirty_reads=OFF;
 --error ER_UNKNOWN_COM_ERROR
 SELECT i, variable_name, variable_value FROM t1, information_schema.session_variables WHERE variable_name LIKE "wsrep_dirty_reads" AND i = 1;
 
+--error ER_UNKNOWN_COM_ERROR
 SELECT 1;
 
+--error ER_UNKNOWN_COM_ERROR
 USE information_schema;
 
 SELECT * FROM information_schema.session_variables WHERE variable_name LIKE "wsrep_dirty_reads";

diff --git a/mysql-test/suite/galera/t/galera_var_reject_queries.test b/mysql-test/suite/galera/t/galera_var_reject_queries.test
@@ -23,7 +23,7 @@ SELECT * FROM t1;
 SET GLOBAL wsrep_reject_queries = ALL_KILL;
 
 --connection node_1a
---error ER_CONNECTION_KILLED
+--error ER_CONNECTION_KILLED,2013
 SELECT * FROM t1;
 
 --connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1