Skip to content

Commit 4cb6edb

Browse files
author
Nirbhay Choubey
committed
Update failing galera tests
1 parent 28ad6a7 commit 4cb6edb

File tree

6 files changed

+48
-47
lines changed

6 files changed

+48
-47
lines changed

‎mysql-test/suite/galera/r/galera_create_function.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ SQL SECURITY INVOKER
2020
RETURN 123;
2121
SHOW CREATE FUNCTION f1;
2222
Function sql_mode Create Function character_set_client collation_connection Database Collation
23-
f1 CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1
23+
f1 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1
2424
MODIFIES SQL DATA
2525
COMMENT 'f1_comment'
2626
RETURN 'abc' latin1 latin1_swedish_ci latin1_swedish_ci
2727
SHOW CREATE FUNCTION f1;
2828
Function sql_mode Create Function character_set_client collation_connection Database Collation
29-
f1 CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1
29+
f1 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`user1`@`%` FUNCTION `f1`(param INTEGER) RETURNS varchar(200) CHARSET latin1
3030
MODIFIES SQL DATA
3131
COMMENT 'f1_comment'
3232
RETURN 'abc' latin1 latin1_swedish_ci latin1_swedish_ci
3333
SHOW CREATE FUNCTION f2;
3434
Function sql_mode Create Function character_set_client collation_connection Database Collation
35-
f2 CREATE DEFINER=`root`@`localhost` FUNCTION `f2`(param VARCHAR(100)) RETURNS int(11)
35+
f2 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` FUNCTION `f2`(param VARCHAR(100)) RETURNS int(11)
3636
NO SQL
3737
DETERMINISTIC
3838
SQL SECURITY INVOKER
3939
RETURN 123 latin1 latin1_swedish_ci latin1_swedish_ci
4040
SHOW CREATE FUNCTION f2;
4141
Function sql_mode Create Function character_set_client collation_connection Database Collation
42-
f2 CREATE DEFINER=`root`@`localhost` FUNCTION `f2`(param VARCHAR(100)) RETURNS int(11)
42+
f2 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` FUNCTION `f2`(param VARCHAR(100)) RETURNS int(11)
4343
NO SQL
4444
DETERMINISTIC
4545
SQL SECURITY INVOKER

‎mysql-test/suite/galera/r/galera_create_procedure.result

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ NO SQL
1818
SQL SECURITY INVOKER BEGIN END ;
1919
SHOW CREATE PROCEDURE p1;
2020
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
21-
p1 CREATE DEFINER=`user1`@`%` PROCEDURE `p1`(IN param1 INTEGER, OUT param2 INTEGER, INOUT param3 INTEGER)
21+
p1 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`user1`@`%` PROCEDURE `p1`(IN param1 INTEGER, OUT param2 INTEGER, INOUT param3 INTEGER)
2222
MODIFIES SQL DATA
2323
COMMENT 'p1_comment'
2424
INSERT INTO t1 VALUES (1) latin1 latin1_swedish_ci latin1_swedish_ci
@@ -27,20 +27,20 @@ SELECT 1 FROM DUAL;
2727
1
2828
SHOW CREATE PROCEDURE p1;
2929
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
30-
p1 CREATE DEFINER=`user1`@`%` PROCEDURE `p1`(IN param1 INTEGER, OUT param2 INTEGER, INOUT param3 INTEGER)
30+
p1 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`user1`@`%` PROCEDURE `p1`(IN param1 INTEGER, OUT param2 INTEGER, INOUT param3 INTEGER)
3131
MODIFIES SQL DATA
3232
COMMENT 'p1_comment'
3333
INSERT INTO t1 VALUES (1) latin1 latin1_swedish_ci latin1_swedish_ci
3434
SHOW CREATE PROCEDURE p2;
3535
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
36-
p2 CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(param VARCHAR(100))
36+
p2 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(param VARCHAR(100))
3737
NO SQL
3838
DETERMINISTIC
3939
SQL SECURITY INVOKER
4040
BEGIN END latin1 latin1_swedish_ci latin1_swedish_ci
4141
SHOW CREATE PROCEDURE p2;
4242
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
43-
p2 CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(param VARCHAR(100))
43+
p2 NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`(param VARCHAR(100))
4444
NO SQL
4545
DETERMINISTIC
4646
SQL SECURITY INVOKER

‎mysql-test/suite/galera/r/galera_log_bin.result

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,46 @@ ALTER TABLE t1 ADD COLUMN f2 INTEGER;
1313
FLUSH LOGS;
1414
SHOW BINLOG EVENTS IN 'mysqld-bin.000002' LIMIT 4,18;
1515
Log_name Pos Event_type Server_id End_log_pos Info
16-
mysqld-bin.000002 353 Gtid 1 391 GTID 0-1-1
17-
mysqld-bin.000002 391 Query 1 504 use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB
18-
mysqld-bin.000002 504 Gtid 1 542 BEGIN GTID 0-1-2
19-
mysqld-bin.000002 542 Table_map 1 583 table_id: 48 (test.t1)
20-
mysqld-bin.000002 583 Write_rows_v1 1 617 table_id: 48 flags: STMT_END_F
21-
mysqld-bin.000002 617 Xid 1 644 COMMIT /* xid=2 */
22-
mysqld-bin.000002 644 Gtid 1 682 GTID 0-1-3
23-
mysqld-bin.000002 682 Query 1 783 use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB
24-
mysqld-bin.000002 783 Gtid 1 821 BEGIN GTID 0-1-4
25-
mysqld-bin.000002 821 Table_map 1 862 table_id: 49 (test.t2)
26-
mysqld-bin.000002 862 Write_rows_v1 1 896 table_id: 49 flags: STMT_END_F
27-
mysqld-bin.000002 896 Xid 1 923 COMMIT /* xid=4 */
28-
mysqld-bin.000002 923 Gtid 1 961 BEGIN GTID 0-1-5
29-
mysqld-bin.000002 961 Table_map 1 1002 table_id: 49 (test.t2)
30-
mysqld-bin.000002 1002 Write_rows_v1 1 1036 table_id: 49 flags: STMT_END_F
31-
mysqld-bin.000002 1036 Xid 1 1063 COMMIT /* xid=5 */
32-
mysqld-bin.000002 1063 Gtid 1 1101 GTID 0-1-6
33-
mysqld-bin.000002 1101 Query 1 1200 use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER
16+
mysqld-bin.000002 # Gtid # # GTID 0-1-1
17+
mysqld-bin.000002 # Query # # use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB
18+
mysqld-bin.000002 # Gtid # # BEGIN GTID 0-1-2
19+
mysqld-bin.000002 # Table_map # # table_id: 48 (test.t1)
20+
mysqld-bin.000002 # Write_rows_v1 # # table_id: 48 flags: STMT_END_F
21+
mysqld-bin.000002 # Xid # # COMMIT /* xid=2 */
22+
mysqld-bin.000002 # Gtid # # GTID 0-1-3
23+
mysqld-bin.000002 # Query # # use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB
24+
mysqld-bin.000002 # Gtid # # BEGIN GTID 0-1-4
25+
mysqld-bin.000002 # Table_map # # table_id: 49 (test.t2)
26+
mysqld-bin.000002 # Write_rows_v1 # # table_id: 49 flags: STMT_END_F
27+
mysqld-bin.000002 # Xid # # COMMIT /* xid=4 */
28+
mysqld-bin.000002 # Gtid # # BEGIN GTID 0-1-5
29+
mysqld-bin.000002 # Table_map # # table_id: 49 (test.t2)
30+
mysqld-bin.000002 # Write_rows_v1 # # table_id: 49 flags: STMT_END_F
31+
mysqld-bin.000002 # Xid # # COMMIT /* xid=5 */
32+
mysqld-bin.000002 # Gtid # # GTID 0-1-6
33+
mysqld-bin.000002 # Query # # use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER
3434
SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
3535
COUNT(*) = 2
3636
1
3737
SHOW BINLOG EVENTS IN 'mysqld-bin.000003' LIMIT 3,18;
3838
Log_name Pos Event_type Server_id End_log_pos Info
39-
mysqld-bin.000003 313 Gtid 1 351 GTID 0-1-1
40-
mysqld-bin.000003 351 Query 1 464 use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB
41-
mysqld-bin.000003 464 Gtid 1 502 BEGIN GTID 0-1-2
42-
mysqld-bin.000003 502 Table_map 1 543 table_id: 30 (test.t1)
43-
mysqld-bin.000003 543 Write_rows_v1 1 577 table_id: 30 flags: STMT_END_F
44-
mysqld-bin.000003 577 Xid 1 604 COMMIT /* xid=2 */
45-
mysqld-bin.000003 604 Gtid 1 642 GTID 0-1-3
46-
mysqld-bin.000003 642 Query 1 743 use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB
47-
mysqld-bin.000003 743 Gtid 1 781 BEGIN GTID 0-1-4
48-
mysqld-bin.000003 781 Table_map 1 822 table_id: 31 (test.t2)
49-
mysqld-bin.000003 822 Write_rows_v1 1 856 table_id: 31 flags: STMT_END_F
50-
mysqld-bin.000003 856 Xid 1 883 COMMIT /* xid=4 */
51-
mysqld-bin.000003 883 Gtid 1 921 BEGIN GTID 0-1-5
52-
mysqld-bin.000003 921 Table_map 1 962 table_id: 31 (test.t2)
53-
mysqld-bin.000003 962 Write_rows_v1 1 996 table_id: 31 flags: STMT_END_F
54-
mysqld-bin.000003 996 Xid 1 1023 COMMIT /* xid=5 */
55-
mysqld-bin.000003 1023 Gtid 1 1061 GTID 0-1-6
56-
mysqld-bin.000003 1061 Query 1 1160 use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER
39+
mysqld-bin.000003 # Gtid # # GTID 0-1-1
40+
mysqld-bin.000003 # Query # # use `test`; CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB
41+
mysqld-bin.000003 # Gtid # # BEGIN GTID 0-1-2
42+
mysqld-bin.000003 # Table_map # # table_id: 30 (test.t1)
43+
mysqld-bin.000003 # Write_rows_v1 # # table_id: 30 flags: STMT_END_F
44+
mysqld-bin.000003 # Xid # # COMMIT /* xid=2 */
45+
mysqld-bin.000003 # Gtid # # GTID 0-1-3
46+
mysqld-bin.000003 # Query # # use `test`; CREATE TABLE t2 (id INT) ENGINE=InnoDB
47+
mysqld-bin.000003 # Gtid # # BEGIN GTID 0-1-4
48+
mysqld-bin.000003 # Table_map # # table_id: 31 (test.t2)
49+
mysqld-bin.000003 # Write_rows_v1 # # table_id: 31 flags: STMT_END_F
50+
mysqld-bin.000003 # Xid # # COMMIT /* xid=4 */
51+
mysqld-bin.000003 # Gtid # # BEGIN GTID 0-1-5
52+
mysqld-bin.000003 # Table_map # # table_id: 31 (test.t2)
53+
mysqld-bin.000003 # Write_rows_v1 # # table_id: 31 flags: STMT_END_F
54+
mysqld-bin.000003 # Xid # # COMMIT /* xid=5 */
55+
mysqld-bin.000003 # Gtid # # GTID 0-1-6
56+
mysqld-bin.000003 # Query # # use `test`; ALTER TABLE t1 ADD COLUMN f2 INTEGER
5757
DROP TABLE t1;
5858
DROP TABLE t2;

‎mysql-test/suite/galera/r/rename.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ SELECT * FROM t1;
1010
i
1111
1
1212
# Create a new user 'foo' with limited privileges
13+
CREATE USER foo@localhost;
1314
GRANT SELECT on test.* TO foo@localhost;
1415
# Open connection to the 1st node using 'test_user1' user.
1516
SELECT * FROM t1;

‎mysql-test/suite/galera/t/galera_log_bin.test

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ SELECT COUNT(*) = 2 FROM t2;
2222
ALTER TABLE t1 ADD COLUMN f2 INTEGER;
2323

2424
FLUSH LOGS;
25-
# Use pos 120 in order to skip the header that contains the MySQL version number.
26-
# Otherwise, version number changes will cause the test to break
25+
--replace_column 2 # 4 # 5 #
2726
SHOW BINLOG EVENTS IN 'mysqld-bin.000002' LIMIT 4,18;
2827

2928
--connection node_2
3029
SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 't1';
31-
30+
--replace_column 2 # 4 # 5 #
3231
SHOW BINLOG EVENTS IN 'mysqld-bin.000003' LIMIT 3,18;
3332

3433
DROP TABLE t1;

‎mysql-test/suite/galera/t/rename.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ INSERT INTO t1 VALUE(1);
1616
SELECT * FROM t1;
1717

1818
--echo # Create a new user 'foo' with limited privileges
19+
CREATE USER foo@localhost;
1920
GRANT SELECT on test.* TO foo@localhost;
2021

2122
--echo # Open connection to the 1st node using 'test_user1' user.

0 commit comments

Comments
 (0)