mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-23974 fixup: rpl.rpl_gtid_stop_start fails
The call mtr.add_suppression() that was added
in commit 75b7cd680b
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.
This commit is contained in:
@ -7,6 +7,7 @@
|
||||
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_perfschema.inc
|
||||
--source include/have_innodb.inc
|
||||
|
||||
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 #----------------------------
|
||||
--source suite/perfschema/include/program_setup.inc
|
||||
ALTER TABLE t2 ENGINE=InnoDB;
|
||||
--source suite/perfschema/include/program_execution.inc
|
||||
|
||||
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;
|
||||
--echo # Nested stored programs.
|
||||
--echo #------------------------
|
||||
--source suite/perfschema/include/program_nested_setup.inc
|
||||
ALTER TABLE t2 ENGINE=InnoDB;
|
||||
--source suite/perfschema/include/program_nested_execution.inc
|
||||
|
||||
SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
|
||||
|
Reference in New Issue
Block a user