Commit b101f19d authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-23974 fixup: rpl.rpl_gtid_stop_start fails

The call mtr.add_suppression() that was added
in commit 75b7cd68
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.
parent d2c019b2
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
--disable_query_log --disable_query_log
if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`) if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
{ {
SET STATEMENT sql_log_bin=0 FOR
call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations"); call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
} }
if ($VALGRIND_TEST) if ($VALGRIND_TEST)
{ {
SET STATEMENT sql_log_bin=0 FOR
call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations"); call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
} }
--enable_query_log --enable_query_log
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
# #
--source include/no_protocol.inc --source include/no_protocol.inc
--source include/have_innodb.inc
--echo # SET-UP --echo # SET-UP
CREATE DATABASE nested_sp; CREATE DATABASE nested_sp;
...@@ -17,7 +16,7 @@ CREATE TABLE t1( ...@@ -17,7 +16,7 @@ CREATE TABLE t1(
CREATE TABLE t2( CREATE TABLE t2(
n INT UNSIGNED NOT NULL, n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED f BIGINT UNSIGNED
) engine=innodb; );
--echo ############################ --echo ############################
--echo # Creating Stored Programs # --echo # Creating Stored Programs #
......
...@@ -166,7 +166,7 @@ data INT NOT NULL ...@@ -166,7 +166,7 @@ data INT NOT NULL
CREATE TABLE t2( CREATE TABLE t2(
n INT UNSIGNED NOT NULL, n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED f BIGINT UNSIGNED
) engine=innodb; );
############################ ############################
# Creating Stored Programs # # Creating Stored Programs #
############################ ############################
......
...@@ -166,7 +166,7 @@ data INT NOT NULL ...@@ -166,7 +166,7 @@ data INT NOT NULL
CREATE TABLE t2( CREATE TABLE t2(
n INT UNSIGNED NOT NULL, n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED f BIGINT UNSIGNED
) engine=innodb; );
############################ ############################
# Creating Stored Programs # # Creating Stored Programs #
############################ ############################
......
...@@ -13,7 +13,7 @@ data INT NOT NULL ...@@ -13,7 +13,7 @@ data INT NOT NULL
CREATE TABLE t2( CREATE TABLE t2(
n INT UNSIGNED NOT NULL, n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED f BIGINT UNSIGNED
) engine=innodb; );
############################ ############################
# Creating Stored Programs # # Creating Stored Programs #
############################ ############################
...@@ -67,6 +67,7 @@ END WHILE; ...@@ -67,6 +67,7 @@ END WHILE;
END| END|
CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
CALL ifac(10)| CALL ifac(10)|
ALTER TABLE t2 ENGINE=InnoDB;
##################### #####################
# Executing queries # # Executing queries #
##################### #####################
...@@ -1199,7 +1200,7 @@ data INT NOT NULL ...@@ -1199,7 +1200,7 @@ data INT NOT NULL
CREATE TABLE t2( CREATE TABLE t2(
n INT UNSIGNED NOT NULL, n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED f BIGINT UNSIGNED
) engine=innodb; );
############################ ############################
# Creating Stored Programs # # Creating Stored Programs #
############################ ############################
......
...@@ -101,6 +101,7 @@ CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW ...@@ -101,6 +101,7 @@ CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
SET @del:= @del + 1| SET @del:= @del + 1|
CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW
SET @del:= @del + 8 + old.j| SET @del:= @del + 8 + old.j|
ALTER TABLE t2 ENGINE=InnoDB;
##################### #####################
# Executing queries # # Executing queries #
##################### #####################
...@@ -159,6 +160,7 @@ WHERE CURRENT_SCHEMA='stored_programs' AND ...@@ -159,6 +160,7 @@ WHERE CURRENT_SCHEMA='stored_programs' AND
ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT; ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT;
EVENT_NAME SQL_TEXT OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL EVENT_NAME SQL_TEXT OBJECT_NAME NESTING_EVENT_TYPE NESTING_EVENT_LEVEL
statement/scheduler/event NULL NULL NULL 0 statement/scheduler/event NULL NULL NULL 0
statement/sql/alter_table ALTER TABLE t2 ENGINE=InnoDB NULL NULL 0
statement/sql/call_procedure CALL SampleProc1(30,40,50) NULL NULL 0 statement/sql/call_procedure CALL SampleProc1(30,40,50) NULL NULL 0
statement/sql/call_procedure CALL SampleProc2("Jwalamukhi",34) NULL NULL 0 statement/sql/call_procedure CALL SampleProc2("Jwalamukhi",34) NULL NULL 0
statement/sql/call_procedure CALL SampleProc3() NULL NULL 0 statement/sql/call_procedure CALL SampleProc3() NULL NULL 0
...@@ -375,7 +377,7 @@ data INT NOT NULL ...@@ -375,7 +377,7 @@ data INT NOT NULL
CREATE TABLE t2( CREATE TABLE t2(
n INT UNSIGNED NOT NULL, n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED f BIGINT UNSIGNED
) engine=innodb; );
############################ ############################
# Creating Stored Programs # # Creating Stored Programs #
############################ ############################
...@@ -429,6 +431,7 @@ END WHILE; ...@@ -429,6 +431,7 @@ END WHILE;
END| END|
CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
CALL ifac(10)| CALL ifac(10)|
ALTER TABLE t2 ENGINE=InnoDB;
##################### #####################
# Executing queries # # Executing queries #
##################### #####################
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source include/have_innodb.inc
TRUNCATE TABLE performance_schema.events_statements_summary_by_program; TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
TRUNCATE TABLE performance_schema.events_statements_history_long; TRUNCATE TABLE performance_schema.events_statements_history_long;
...@@ -13,6 +14,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long; ...@@ -13,6 +14,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
--echo ################################################# --echo #################################################
--source suite/perfschema/include/program_nested_setup.inc --source suite/perfschema/include/program_nested_setup.inc
ALTER TABLE t2 ENGINE=InnoDB;
--source suite/perfschema/include/program_nested_execution.inc --source suite/perfschema/include/program_nested_execution.inc
SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA, SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source include/have_innodb.inc
TRUNCATE TABLE performance_schema.events_statements_history_long; TRUNCATE TABLE performance_schema.events_statements_history_long;
...@@ -14,6 +15,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long; ...@@ -14,6 +15,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
--echo # Non-nested Stored programs. --echo # Non-nested Stored programs.
--echo #---------------------------- --echo #----------------------------
--source suite/perfschema/include/program_setup.inc --source suite/perfschema/include/program_setup.inc
ALTER TABLE t2 ENGINE=InnoDB;
--source suite/perfschema/include/program_execution.inc --source suite/perfschema/include/program_execution.inc
SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL 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; ...@@ -31,6 +33,7 @@ TRUNCATE TABLE performance_schema.events_statements_history_long;
--echo # Nested stored programs. --echo # Nested stored programs.
--echo #------------------------ --echo #------------------------
--source suite/perfschema/include/program_nested_setup.inc --source suite/perfschema/include/program_nested_setup.inc
ALTER TABLE t2 ENGINE=InnoDB;
--source suite/perfschema/include/program_nested_execution.inc --source suite/perfschema/include/program_nested_execution.inc
SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment