Skip to content

Commit b101f19

Browse files
committed
MDEV-23974 fixup: rpl.rpl_gtid_stop_start fails
The call mtr.add_suppression() that was added in commit 75b7cd6 for MemorySanitizer and Valgrind runs is causing a result difference for the test rpl.rpl_gtid_stop_start. Let us disable the binlog for executing that statement. Also, the test perfschema.statement_program_lost_inst would fail due to the changes to have_innodb.inc in this commit. To compensate for that, we will make more --suite=perfschema tests run without InnoDB, and explicitly enable InnoDB in those tests that depend on a transactional storage engine.
1 parent d2c019b commit b101f19

8 files changed

+17
-7
lines changed

mysql-test/include/have_innodb.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
--disable_query_log
66
if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
77
{
8+
SET STATEMENT sql_log_bin=0 FOR
89
call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
910
}
1011
if ($VALGRIND_TEST)
1112
{
13+
SET STATEMENT sql_log_bin=0 FOR
1214
call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
1315
}
1416
--enable_query_log

mysql-test/suite/perfschema/include/program_nested_setup.inc

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

55
--source include/no_protocol.inc
6-
--source include/have_innodb.inc
76

87
--echo # SET-UP
98
CREATE DATABASE nested_sp;
@@ -17,7 +16,7 @@ CREATE TABLE t1(
1716
CREATE TABLE t2(
1817
n INT UNSIGNED NOT NULL,
1918
f BIGINT UNSIGNED
20-
) engine=innodb;
19+
);
2120

2221
--echo ############################
2322
--echo # Creating Stored Programs #

mysql-test/suite/perfschema/r/max_program_zero.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ data INT NOT NULL
166166
CREATE TABLE t2(
167167
n INT UNSIGNED NOT NULL,
168168
f BIGINT UNSIGNED
169-
) engine=innodb;
169+
);
170170
############################
171171
# Creating Stored Programs #
172172
############################

mysql-test/suite/perfschema/r/statement_program_lost_inst.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ data INT NOT NULL
166166
CREATE TABLE t2(
167167
n INT UNSIGNED NOT NULL,
168168
f BIGINT UNSIGNED
169-
) engine=innodb;
169+
);
170170
############################
171171
# Creating Stored Programs #
172172
############################

mysql-test/suite/perfschema/r/statement_program_nested.result

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ data INT NOT NULL
1313
CREATE TABLE t2(
1414
n INT UNSIGNED NOT NULL,
1515
f BIGINT UNSIGNED
16-
) engine=innodb;
16+
);
1717
############################
1818
# Creating Stored Programs #
1919
############################
@@ -67,6 +67,7 @@ END WHILE;
6767
END|
6868
CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
6969
CALL ifac(10)|
70+
ALTER TABLE t2 ENGINE=InnoDB;
7071
#####################
7172
# Executing queries #
7273
#####################
@@ -1199,7 +1200,7 @@ data INT NOT NULL
11991200
CREATE TABLE t2(
12001201
n INT UNSIGNED NOT NULL,
12011202
f BIGINT UNSIGNED
1202-
) engine=innodb;
1203+
);
12031204
############################
12041205
# Creating Stored Programs #
12051206
############################

mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
101101
SET @del:= @del + 1|
102102
CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW
103103
SET @del:= @del + 8 + old.j|
104+
ALTER TABLE t2 ENGINE=InnoDB;
104105
#####################
105106
# Executing queries #
106107
#####################
@@ -159,6 +160,7 @@ WHERE CURRENT_SCHEMA='stored_programs' AND
159160
ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT;
160161
EVENT_NAME SQL_TEXT OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL
161162
statement/scheduler/event NULL NULL NULL 0
163+
statement/sql/alter_table ALTER TABLE t2 ENGINE=InnoDB NULL NULL 0
162164
statement/sql/call_procedure CALL SampleProc1(30,40,50) NULL NULL 0
163165
statement/sql/call_procedure CALL SampleProc2("Jwalamukhi",34) NULL NULL 0
164166
statement/sql/call_procedure CALL SampleProc3() NULL NULL 0
@@ -375,7 +377,7 @@ data INT NOT NULL
375377
CREATE TABLE t2(
376378
n INT UNSIGNED NOT NULL,
377379
f BIGINT UNSIGNED
378-
) engine=innodb;
380+
);
379381
############################
380382
# Creating Stored Programs #
381383
############################
@@ -429,6 +431,7 @@ END WHILE;
429431
END|
430432
CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
431433
CALL ifac(10)|
434+
ALTER TABLE t2 ENGINE=InnoDB;
432435
#####################
433436
# Executing queries #
434437
#####################

mysql-test/suite/perfschema/t/statement_program_nested.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
--source include/not_embedded.inc
66
--source include/have_perfschema.inc
7+
--source include/have_innodb.inc
78

89
TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
910
TRUNCATE TABLE performance_schema.events_statements_history_long;
@@ -13,6 +14,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
1314
--echo #################################################
1415

1516
--source suite/perfschema/include/program_nested_setup.inc
17+
ALTER TABLE t2 ENGINE=InnoDB;
1618
--source suite/perfschema/include/program_nested_execution.inc
1719

1820
SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,

mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77

88
--source include/not_embedded.inc
99
--source include/have_perfschema.inc
10+
--source include/have_innodb.inc
1011

1112
TRUNCATE TABLE performance_schema.events_statements_history_long;
1213

1314
--echo #----------------------------
1415
--echo # Non-nested Stored programs.
1516
--echo #----------------------------
1617
--source suite/perfschema/include/program_setup.inc
18+
ALTER TABLE t2 ENGINE=InnoDB;
1719
--source suite/perfschema/include/program_execution.inc
1820

1921
SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
@@ -31,6 +33,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
3133
--echo # Nested stored programs.
3234
--echo #------------------------
3335
--source suite/perfschema/include/program_nested_setup.inc
36+
ALTER TABLE t2 ENGINE=InnoDB;
3437
--source suite/perfschema/include/program_nested_execution.inc
3538

3639
SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL

0 commit comments

Comments
 (0)