Skip to content

Commit 276d65b

Browse files
author
Nirbhay Choubey
committed
Fix for test failures.
1 parent b9c42d7 commit 276d65b

14 files changed

+62
-17
lines changed

mysql-test/suite/galera/disabled.def

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ galera_ssl_upgrade : TODO: investigate
2727
mysql-wsrep#90 : TODO: investigate
2828
galera_flush : mysql-wsrep/issues/229
2929
galera_transaction_read_only : mysql-wsrep/issues/229
30+
galera_gcs_fragment : Incorrect arguments to SET
31+
galera_flush_local : Fails sporadically

mysql-test/suite/galera/r/galera_flush_local.result

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
DROP TABLE IF EXISTS t1, t2, x1, x2;
22
CREATE TABLE t1 (f1 INTEGER);
33
CREATE TABLE t2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
4-
SET GLOBAL wsrep_replicate_myisam = TRUE;
54
CREATE TABLE x1 (f1 INTEGER) ENGINE=MyISAM;
65
CREATE TABLE x2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER) ENGINE=MyISAM;
76
INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -21,6 +20,10 @@ FLUSH LOCAL SLOW LOGS;
2120
FLUSH LOCAL GENERAL LOGS;
2221
FLUSH LOCAL ENGINE LOGS;
2322
FLUSH LOCAL RELAY LOGS;
23+
FLUSH LOCAL CLIENT_STATISTICS;
24+
FLUSH LOCAL INDEX_STATISTICS;
25+
FLUSH LOCAL TABLE_STATISTICS;
26+
FLUSH LOCAL USER_STATISTICS;
2427
FLUSH LOCAL LOGS;
2528
FLUSH LOCAL BINARY LOGS;
2629
FLUSH LOCAL TABLES WITH READ LOCK;
@@ -68,7 +71,6 @@ COUNT(*) = 10
6871
DROP TABLE t1, t2, x1, x2;
6972
CREATE TABLE t1 (f1 INTEGER);
7073
CREATE TABLE t2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER);
71-
SET GLOBAL wsrep_replicate_myisam = TRUE;
7274
CREATE TABLE x1 (f1 INTEGER) ENGINE=MyISAM;
7375
CREATE TABLE x2 (f1 INT PRIMARY KEY AUTO_INCREMENT, f2 INTEGER) ENGINE=MyISAM;
7476
INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
@@ -89,6 +91,10 @@ FLUSH SLOW LOGS;
8991
FLUSH GENERAL LOGS;
9092
FLUSH ENGINE LOGS;
9193
FLUSH RELAY LOGS;
94+
FLUSH CLIENT_STATISTICS;
95+
FLUSH INDEX_STATISTICS;
96+
FLUSH TABLE_STATISTICS;
97+
FLUSH USER_STATISTICS;
9298
FLUSH LOGS;
9399
FLUSH BINARY LOGS;
94100
FLUSH TABLES WITH READ LOCK;

mysql-test/suite/galera/r/galera_mdl_race.result

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ START TRANSACTION;
77
UPDATE t1 SET f2 = 'b' WHERE f1 = 1;
88
LOCK TABLE t2 WRITE;
99
SET GLOBAL DEBUG = "d,sync.wsrep_before_mdl_wait";
10+
Warnings:
11+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
1012
SELECT * FROM t2;;
1113
SET GLOBAL DEBUG = "d,sync.wsrep_after_BF_victim_lock";
14+
Warnings:
15+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
1216
UPDATE t1 SET f2 = 'c' WHERE f1 = 1;
1317
SET GLOBAL DEBUG = "";
18+
Warnings:
19+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
1420
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_before_mdl_wait";
1521
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_after_BF_victim_lock";
1622
UNLOCK TABLES;
@@ -29,3 +35,4 @@ COUNT(*) = 1
2935
1
3036
DROP TABLE t1;
3137
DROP TABLE t2;
38+
SET DEBUG_SYNC = "RESET";

mysql-test/suite/galera/r/galera_query_cache_sync_wait.result

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
22
INSERT INTO t1 VALUES (1);
33
SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT1S";
44
SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
5+
Warnings:
6+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
57
SET SESSION wsrep_sync_wait = 7;
68
SELECT MAX(id) FROM t1;
79
MAX(id)
@@ -10,14 +12,21 @@ INSERT INTO t1 VALUES (2);
1012
SELECT MAX(id) FROM t1;
1113
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
1214
SET GLOBAL DEBUG = "";
15+
Warnings:
16+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
1317
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
1418
FLUSH QUERY CACHE;
1519
SET SESSION wsrep_sync_wait = 7;
1620
SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
21+
Warnings:
22+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
23+
SET DEBUG_SYNC = "RESET";
1724
INSERT INTO t1 VALUES (3);
1825
SELECT MAX(id) FROM t1;
1926
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
2027
SET GLOBAL DEBUG = "";
28+
Warnings:
29+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
2130
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
2231
INSERT INTO t1 VALUES (4);
2332
SET SESSION wsrep_sync_wait = 7;
@@ -33,10 +42,14 @@ SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_
3342
VARIABLE_VALUE = 1
3443
1
3544
SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
45+
Warnings:
46+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
3647
INSERT INTO t1 VALUES (5);
3748
SET SESSION wsrep_sync_wait = 7;
3849
SELECT MAX(id) FROM t1 ;
3950
SET GLOBAL DEBUG = "";
51+
Warnings:
52+
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
4053
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
4154
MAX(id)
4255
5

mysql-test/suite/galera/r/galera_sync_wait_show.result

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ DROP DATABASE db1;
77
CREATE PROCEDURE p1 () SELECT 1 FROM DUAL;
88
SHOW CREATE PROCEDURE p1;
99
Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
10-
p1 NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
10+
p1 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
1111
SELECT 1 FROM DUAL latin1 latin1_swedish_ci latin1_swedish_ci
1212
DROP PROCEDURE p1;
1313
CREATE PROCEDURE p1 () SELECT 1 FROM DUAL;
1414
SHOW PROCEDURE CODE p1;
1515
Pos Instruction
16-
0 stmt "SELECT 1 FROM DUAL"
16+
0 stmt 0 "SELECT 1 FROM DUAL"
1717
DROP PROCEDURE p1;
1818
CREATE FUNCTION f1 () RETURNS INTEGER RETURN 123;
1919
SHOW CREATE FUNCTION f1;
2020
Function sql_mode Create Function character_set_client collation_connection Database Collation
21-
f1 NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
21+
f1 CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
2222
RETURN 123 latin1 latin1_swedish_ci latin1_swedish_ci
2323
DROP FUNCTION f1;
2424
CREATE FUNCTION f1 () RETURNS INTEGER RETURN 123;
@@ -30,10 +30,10 @@ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
3030
CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.f1 = 'a';
3131
SHOW CREATE TRIGGER tr1;
3232
Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation
33-
tr1 NO_ENGINE_SUBSTITUTION CREATE DEFINER=`root`@`localhost` TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.f1 = 'a' latin1 latin1_swedish_ci latin1_swedish_ci
33+
tr1 CREATE DEFINER=`root`@`localhost` TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET NEW.f1 = 'a' latin1 latin1_swedish_ci latin1_swedish_ci
3434
DROP TABLE t1;
3535
CREATE EVENT event1 ON SCHEDULE AT '2038-01-01 23:59:59' DO SELECT 1;
3636
SHOW CREATE EVENT event1;
3737
Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation
38-
event1 NO_ENGINE_SUBSTITUTION SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `event1` ON SCHEDULE AT '2038-01-01 23:59:59' ON COMPLETION NOT PRESERVE DISABLE ON SLAVE DO SELECT 1 latin1 latin1_swedish_ci latin1_swedish_ci
38+
event1 SYSTEM CREATE DEFINER=`root`@`localhost` EVENT `event1` ON SCHEDULE AT '2038-01-01 23:59:59' ON COMPLETION NOT PRESERVE DISABLE ON SLAVE DO SELECT 1 latin1 latin1_swedish_ci latin1_swedish_ci
3939
DROP EVENT event1;

mysql-test/suite/galera/t/galera_mdl_race.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,7 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f2 = 'c';
7373

7474
DROP TABLE t1;
7575
DROP TABLE t2;
76+
77+
--connection node_1a
78+
SET DEBUG_SYNC = "RESET";
79+
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
--query_cache_type=1 --query_cache_size=1355776
2-
3-
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--query_cache_type=1
1+
--query_cache_type=1 --query_cache_size=1355776

mysql-test/suite/galera/t/galera_query_cache_sync_wait.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
2929
FLUSH QUERY CACHE;
3030
SET SESSION wsrep_sync_wait = 7;
3131
SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
32+
SET DEBUG_SYNC = "RESET";
3233

3334
#
3435
# Query cache miss, wait timeout
@@ -88,3 +89,6 @@ SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_
8889
--disable_query_log
8990
--eval SET GLOBAL wsrep_provider_options = "$wsrep_provider_options_orig"
9091
DROP TABLE t1;
92+
93+
--connection node_2a
94+
SET DEBUG_SYNC = "RESET";

mysql-test/suite/galera/t/galera_sync_wait_show.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#
44

55
--source include/galera_cluster.inc
6+
--source include/have_innodb.inc
67

78
--connection node_2
89
SET SESSION wsrep_sync_wait = 1;

0 commit comments

Comments
 (0)