Commit b430aaba authored by Bjorn Munch's avatar Bjorn Munch

Followup fix for Bug 17827378 MTR DOES NOT REPORT IF A TEST

                              FAILS TO DROP CREATED EVENTS:

- Check for triggers should exclude mtr's own
- Move the code to before checksum table as it might affect result
  of some autdit_log tests (does in 5.6)
- Replace SHOW STATUS LIKE 'slave_open_temp_tables' to be like in 5.6
parent 48bec2a9
...@@ -52,6 +52,16 @@ BEGIN ...@@ -52,6 +52,16 @@ BEGIN
WHERE table_schema='mysql' AND table_name != 'ndb_apply_status' WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'
ORDER BY columns_in_mysql; ORDER BY columns_in_mysql;
-- Dump all events, there should be none
SELECT * FROM INFORMATION_SCHEMA.EVENTS;
-- Dump all triggers except mtr internals, there should be none
SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert');
-- Dump all created procedures, there should be none
SELECT * FROM INFORMATION_SCHEMA.ROUTINES;
SHOW STATUS LIKE 'slave_open_temp_tables';
-- Checksum system tables to make sure they have been properly -- Checksum system tables to make sure they have been properly
-- restored after test -- restored after test
checksum table checksum table
...@@ -72,15 +82,6 @@ BEGIN ...@@ -72,15 +82,6 @@ BEGIN
mysql.time_zone_transition_type, mysql.time_zone_transition_type,
mysql.user; mysql.user;
show status like 'slave_open_temp_tables';
-- Dump all events, there should be none
SELECT * FROM INFORMATION_SCHEMA.EVENTS;
-- Dump all triggers, there should be none
SELECT * FROM INFORMATION_SCHEMA.TRIGGERS;
-- Dump all created procedures, there should be none
SELECT * FROM INFORMATION_SCHEMA.ROUTINES;
END|| END||
-- --
......
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