From 91689490478f3d8a2fc6280b57d3a922f5e357f5 Mon Sep 17 00:00:00 2001
From: He Zhenxing <zhenxing.he@sun.com>
Date: Thu, 10 Dec 2009 11:44:19 +0800
Subject: [PATCH] Post fix for bug#45520

mysql-test/include/kill_query.inc:
  Error 1034 can be generated when change MyISAM table indexes was interrupted
mysql-test/r/rpl_killed_ddl.result:
  table t4 may not exists because the ALTER above was interrupted
mysql-test/t/rpl_killed_ddl.test:
  table t4 may not exists because the ALTER above was interrupted
---
 mysql-test/include/kill_query.inc  | 2 +-
 mysql-test/r/rpl_killed_ddl.result | 1 +
 mysql-test/t/rpl_killed_ddl.test   | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mysql-test/include/kill_query.inc b/mysql-test/include/kill_query.inc
index 341c3b93535..b303ed0ec39 100644
--- a/mysql-test/include/kill_query.inc
+++ b/mysql-test/include/kill_query.inc
@@ -52,7 +52,7 @@ if (`SELECT '$debug_lock' != ''`)
 
 # reap the result of the waiting query
 connection $connection_name;
-error 0, 1317, 1307, 1306, 1334, 1305;
+error 0, 1317, 1307, 1306, 1334, 1305, 1034;
 reap;
 
 connection master;
diff --git a/mysql-test/r/rpl_killed_ddl.result b/mysql-test/r/rpl_killed_ddl.result
index b9ee915bdce..59c80d8f6cc 100644
--- a/mysql-test/r/rpl_killed_ddl.result
+++ b/mysql-test/r/rpl_killed_ddl.result
@@ -94,6 +94,7 @@ source include/diff_master_slave.inc;
 DROP INDEX i1 on t1;
 source include/kill_query.inc;
 source include/diff_master_slave.inc;
+CREATE TABLE IF NOT EXISTS t4 (a int);
 CREATE TRIGGER tr2 BEFORE INSERT ON t4
 FOR EACH ROW BEGIN
 DELETE FROM t1 WHERE a=NEW.a;
diff --git a/mysql-test/t/rpl_killed_ddl.test b/mysql-test/t/rpl_killed_ddl.test
index 7c07d5eecf0..b0d7258998f 100644
--- a/mysql-test/t/rpl_killed_ddl.test
+++ b/mysql-test/t/rpl_killed_ddl.test
@@ -203,6 +203,11 @@ source include/kill_query_and_diff_master_slave.inc;
 
 ######## 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%';
 
 DELIMITER //;