From 4cb6edba780085cbb82ef5fce2298f7df5fa0169 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Tue, 8 Sep 2015 17:46:03 -0400
Subject: [PATCH] Update failing galera tests

---
 .../galera/r/galera_create_function.result    |  8 +--
 .../galera/r/galera_create_procedure.result   |  8 +--
 .../suite/galera/r/galera_log_bin.result      | 72 +++++++++----------
 mysql-test/suite/galera/r/rename.result       |  1 +
 mysql-test/suite/galera/t/galera_log_bin.test |  5 +-
 mysql-test/suite/galera/t/rename.test         |  1 +
 6 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/mysql-test/suite/galera/r/galera_create_function.result b/mysql-test/suite/galera/r/galera_create_function.result
index 442e2cf0e10..10020712286 100644
--- a/mysql-test/suite/galera/r/galera_create_function.result
+++ b/mysql-test/suite/galera/r/galera_create_function.result
@@ -20,26 +20,26 @@ SQL SECURITY INVOKER
 RETURN 123;
 SHOW CREATE FUNCTION f1;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-f1		CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1
+f1	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1
     MODIFIES SQL DATA
     COMMENT 'f1_comment'
 RETURN 'abc'	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW CREATE FUNCTION f1;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-f1		CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1
+f1	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1
     MODIFIES SQL DATA
     COMMENT 'f1_comment'
 RETURN 'abc'	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW CREATE FUNCTION f2;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-f2		CREATE DEFINER=`root`@`localhost` FUNCTION `f2`(param VARCHAR(100)) RETURNS int(11)
+f2	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` FUNCTION `f2`(param VARCHAR(100)) RETURNS int(11)
     NO SQL
     DETERMINISTIC
     SQL SECURITY INVOKER
 RETURN 123	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW CREATE FUNCTION f2;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-f2		CREATE DEFINER=`root`@`localhost` FUNCTION `f2`(param VARCHAR(100)) RETURNS int(11)
+f2	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` FUNCTION `f2`(param VARCHAR(100)) RETURNS int(11)
     NO SQL
     DETERMINISTIC
     SQL SECURITY INVOKER
diff --git a/mysql-test/suite/galera/r/galera_create_procedure.result b/mysql-test/suite/galera/r/galera_create_procedure.result
index 0806749ebc8..6191ef48ee5 100644
--- a/mysql-test/suite/galera/r/galera_create_procedure.result
+++ b/mysql-test/suite/galera/r/galera_create_procedure.result
@@ -18,7 +18,7 @@ NO SQL
 SQL SECURITY INVOKER BEGIN END ;
 SHOW CREATE PROCEDURE p1;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1		CREATE DEFINER=`user1`@`%` PROCEDURE `p1`(IN param1 INTEGER, OUT param2 INTEGER, INOUT param3 INTEGER)
+p1	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`user1`@`%` PROCEDURE `p1`(IN param1 INTEGER, OUT param2 INTEGER, INOUT param3 INTEGER)
     MODIFIES SQL DATA
     COMMENT 'p1_comment'
 INSERT INTO t1 VALUES (1)	latin1	latin1_swedish_ci	latin1_swedish_ci
@@ -27,20 +27,20 @@ SELECT 1 FROM DUAL;
 1
 SHOW CREATE PROCEDURE p1;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p1		CREATE DEFINER=`user1`@`%` PROCEDURE `p1`(IN param1 INTEGER, OUT param2 INTEGER, INOUT param3 INTEGER)
+p1	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`user1`@`%` PROCEDURE `p1`(IN param1 INTEGER, OUT param2 INTEGER, INOUT param3 INTEGER)
     MODIFIES SQL DATA
     COMMENT 'p1_comment'
 INSERT INTO t1 VALUES (1)	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW CREATE PROCEDURE p2;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2		CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(param VARCHAR(100))
+p2	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(param VARCHAR(100))
     NO SQL
     DETERMINISTIC
     SQL SECURITY INVOKER
 BEGIN END	latin1	latin1_swedish_ci	latin1_swedish_ci
 SHOW CREATE PROCEDURE p2;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
-p2		CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(param VARCHAR(100))
+p2	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(param VARCHAR(100))
     NO SQL
     DETERMINISTIC
     SQL SECURITY INVOKER
diff --git a/mysql-test/suite/galera/r/galera_log_bin.result b/mysql-test/suite/galera/r/galera_log_bin.result
index 2f0b9ff0716..6411a1e3043 100644
--- a/mysql-test/suite/galera/r/galera_log_bin.result
+++ b/mysql-test/suite/galera/r/galera_log_bin.result
@@ -13,46 +13,46 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER;
 FLUSH LOGS;
 SHOW BINLOG EVENTS IN 'mysqld-bin.000002' LIMIT 4,18;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-mysqld-bin.000002	353	Gtid	1	391	GTID 0-1-1
-mysqld-bin.000002	391	Query	1	504	use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB
-mysqld-bin.000002	504	Gtid	1	542	BEGIN GTID 0-1-2
-mysqld-bin.000002	542	Table_map	1	583	table_id: 48 (test.t1)
-mysqld-bin.000002	583	Write_rows_v1	1	617	table_id: 48 flags: STMT_END_F
-mysqld-bin.000002	617	Xid	1	644	COMMIT /* xid=2 */
-mysqld-bin.000002	644	Gtid	1	682	GTID 0-1-3
-mysqld-bin.000002	682	Query	1	783	use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB
-mysqld-bin.000002	783	Gtid	1	821	BEGIN GTID 0-1-4
-mysqld-bin.000002	821	Table_map	1	862	table_id: 49 (test.t2)
-mysqld-bin.000002	862	Write_rows_v1	1	896	table_id: 49 flags: STMT_END_F
-mysqld-bin.000002	896	Xid	1	923	COMMIT /* xid=4 */
-mysqld-bin.000002	923	Gtid	1	961	BEGIN GTID 0-1-5
-mysqld-bin.000002	961	Table_map	1	1002	table_id: 49 (test.t2)
-mysqld-bin.000002	1002	Write_rows_v1	1	1036	table_id: 49 flags: STMT_END_F
-mysqld-bin.000002	1036	Xid	1	1063	COMMIT /* xid=5 */
-mysqld-bin.000002	1063	Gtid	1	1101	GTID 0-1-6
-mysqld-bin.000002	1101	Query	1	1200	use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER
+mysqld-bin.000002	#	Gtid	#	#	GTID 0-1-1
+mysqld-bin.000002	#	Query	#	#	use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB
+mysqld-bin.000002	#	Gtid	#	#	BEGIN GTID 0-1-2
+mysqld-bin.000002	#	Table_map	#	#	table_id: 48 (test.t1)
+mysqld-bin.000002	#	Write_rows_v1	#	#	table_id: 48 flags: STMT_END_F
+mysqld-bin.000002	#	Xid	#	#	COMMIT /* xid=2 */
+mysqld-bin.000002	#	Gtid	#	#	GTID 0-1-3
+mysqld-bin.000002	#	Query	#	#	use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB
+mysqld-bin.000002	#	Gtid	#	#	BEGIN GTID 0-1-4
+mysqld-bin.000002	#	Table_map	#	#	table_id: 49 (test.t2)
+mysqld-bin.000002	#	Write_rows_v1	#	#	table_id: 49 flags: STMT_END_F
+mysqld-bin.000002	#	Xid	#	#	COMMIT /* xid=4 */
+mysqld-bin.000002	#	Gtid	#	#	BEGIN GTID 0-1-5
+mysqld-bin.000002	#	Table_map	#	#	table_id: 49 (test.t2)
+mysqld-bin.000002	#	Write_rows_v1	#	#	table_id: 49 flags: STMT_END_F
+mysqld-bin.000002	#	Xid	#	#	COMMIT /* xid=5 */
+mysqld-bin.000002	#	Gtid	#	#	GTID 0-1-6
+mysqld-bin.000002	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER
 SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
 COUNT(*) = 2
 1
 SHOW BINLOG EVENTS IN 'mysqld-bin.000003' LIMIT 3,18;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-mysqld-bin.000003	313	Gtid	1	351	GTID 0-1-1
-mysqld-bin.000003	351	Query	1	464	use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB
-mysqld-bin.000003	464	Gtid	1	502	BEGIN GTID 0-1-2
-mysqld-bin.000003	502	Table_map	1	543	table_id: 30 (test.t1)
-mysqld-bin.000003	543	Write_rows_v1	1	577	table_id: 30 flags: STMT_END_F
-mysqld-bin.000003	577	Xid	1	604	COMMIT /* xid=2 */
-mysqld-bin.000003	604	Gtid	1	642	GTID 0-1-3
-mysqld-bin.000003	642	Query	1	743	use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB
-mysqld-bin.000003	743	Gtid	1	781	BEGIN GTID 0-1-4
-mysqld-bin.000003	781	Table_map	1	822	table_id: 31 (test.t2)
-mysqld-bin.000003	822	Write_rows_v1	1	856	table_id: 31 flags: STMT_END_F
-mysqld-bin.000003	856	Xid	1	883	COMMIT /* xid=4 */
-mysqld-bin.000003	883	Gtid	1	921	BEGIN GTID 0-1-5
-mysqld-bin.000003	921	Table_map	1	962	table_id: 31 (test.t2)
-mysqld-bin.000003	962	Write_rows_v1	1	996	table_id: 31 flags: STMT_END_F
-mysqld-bin.000003	996	Xid	1	1023	COMMIT /* xid=5 */
-mysqld-bin.000003	1023	Gtid	1	1061	GTID 0-1-6
-mysqld-bin.000003	1061	Query	1	1160	use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER
+mysqld-bin.000003	#	Gtid	#	#	GTID 0-1-1
+mysqld-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB
+mysqld-bin.000003	#	Gtid	#	#	BEGIN GTID 0-1-2
+mysqld-bin.000003	#	Table_map	#	#	table_id: 30 (test.t1)
+mysqld-bin.000003	#	Write_rows_v1	#	#	table_id: 30 flags: STMT_END_F
+mysqld-bin.000003	#	Xid	#	#	COMMIT /* xid=2 */
+mysqld-bin.000003	#	Gtid	#	#	GTID 0-1-3
+mysqld-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB
+mysqld-bin.000003	#	Gtid	#	#	BEGIN GTID 0-1-4
+mysqld-bin.000003	#	Table_map	#	#	table_id: 31 (test.t2)
+mysqld-bin.000003	#	Write_rows_v1	#	#	table_id: 31 flags: STMT_END_F
+mysqld-bin.000003	#	Xid	#	#	COMMIT /* xid=4 */
+mysqld-bin.000003	#	Gtid	#	#	BEGIN GTID 0-1-5
+mysqld-bin.000003	#	Table_map	#	#	table_id: 31 (test.t2)
+mysqld-bin.000003	#	Write_rows_v1	#	#	table_id: 31 flags: STMT_END_F
+mysqld-bin.000003	#	Xid	#	#	COMMIT /* xid=5 */
+mysqld-bin.000003	#	Gtid	#	#	GTID 0-1-6
+mysqld-bin.000003	#	Query	#	#	use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/suite/galera/r/rename.result b/mysql-test/suite/galera/r/rename.result
index f13d3f13b24..3c81e8b6320 100644
--- a/mysql-test/suite/galera/r/rename.result
+++ b/mysql-test/suite/galera/r/rename.result
@@ -10,6 +10,7 @@ SELECT * FROM t1;
 i
 1
 # Create a new user 'foo' with limited privileges
+CREATE USER foo@localhost;
 GRANT SELECT on test.* TO foo@localhost;
 # Open connection to the 1st node using 'test_user1' user.
 SELECT * FROM t1;
diff --git a/mysql-test/suite/galera/t/galera_log_bin.test b/mysql-test/suite/galera/t/galera_log_bin.test
index 4530162f097..e36bd7e6025 100644
--- a/mysql-test/suite/galera/t/galera_log_bin.test
+++ b/mysql-test/suite/galera/t/galera_log_bin.test
@@ -22,13 +22,12 @@ SELECT COUNT(*) = 2 FROM t2;
 ALTER TABLE t1 ADD COLUMN f2 INTEGER;
 
 FLUSH LOGS;
-# Use pos 120 in order to skip the header that contains the MySQL version number.
-# Otherwise, version number changes will cause the test to break
+--replace_column 2 # 4 # 5 #
 SHOW BINLOG EVENTS IN 'mysqld-bin.000002' LIMIT 4,18;
 
 --connection node_2
 SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
-
+--replace_column 2 # 4 # 5 #
 SHOW BINLOG EVENTS IN 'mysqld-bin.000003' LIMIT 3,18;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/rename.test b/mysql-test/suite/galera/t/rename.test
index 27811678bf5..326d64d3b8a 100644
--- a/mysql-test/suite/galera/t/rename.test
+++ b/mysql-test/suite/galera/t/rename.test
@@ -16,6 +16,7 @@ INSERT INTO t1 VALUE(1);
 SELECT * FROM t1;
 
 --echo # Create a new user 'foo' with limited privileges
+CREATE USER foo@localhost;
 GRANT SELECT on test.* TO foo@localhost;
 
 --echo # Open connection to the 1st node using 'test_user1' user.