Commit cc92cd72 authored by He Zhenxing's avatar He Zhenxing

Post fix for bug#45520

parent 714348a8
...@@ -52,7 +52,7 @@ if (`SELECT '$debug_lock' != ''`) ...@@ -52,7 +52,7 @@ if (`SELECT '$debug_lock' != ''`)
# reap the result of the waiting query # reap the result of the waiting query
connection $connection_name; connection $connection_name;
error 0, 1317, 1307, 1306, 1334, 1305; error 0, 1317, 1307, 1306, 1334, 1305, 1034;
reap; reap;
connection master; connection master;
......
...@@ -94,6 +94,7 @@ source include/diff_master_slave.inc; ...@@ -94,6 +94,7 @@ source include/diff_master_slave.inc;
DROP INDEX i1 on t1; DROP INDEX i1 on t1;
source include/kill_query.inc; source include/kill_query.inc;
source include/diff_master_slave.inc; source include/diff_master_slave.inc;
CREATE TABLE IF NOT EXISTS t4 (a int);
CREATE TRIGGER tr2 BEFORE INSERT ON t4 CREATE TRIGGER tr2 BEFORE INSERT ON t4
FOR EACH ROW BEGIN FOR EACH ROW BEGIN
DELETE FROM t1 WHERE a=NEW.a; DELETE FROM t1 WHERE a=NEW.a;
......
...@@ -203,6 +203,11 @@ source include/kill_query_and_diff_master_slave.inc; ...@@ -203,6 +203,11 @@ source include/kill_query_and_diff_master_slave.inc;
######## TRIGGER ######## ######## TRIGGER ########
# Make sure table t4 exists
connection master;
CREATE TABLE IF NOT EXISTS t4 (a int);
connection master1;
let $diff_statement= SHOW TRIGGERS LIKE 'v%'; let $diff_statement= SHOW TRIGGERS LIKE 'v%';
DELIMITER //; DELIMITER //;
......
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