bzr commit into mysql-5.0-bugteam branch (zhenxing.he:2863) Bug#45520

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/b45520/5.0-bugteam/ based on revid:zhenxing.he@stripped

 2863 He Zhenxing	2009-12-10
      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

    M  mysql-test/include/kill_query.inc
    M  mysql-test/r/rpl_killed_ddl.result
    M  mysql-test/t/rpl_killed_ddl.test
=== modified file 'mysql-test/include/kill_query.inc'
--- a/mysql-test/include/kill_query.inc	2009-03-27 05:19:50 +0000
+++ b/mysql-test/include/kill_query.inc	2009-12-10 03:44:19 +0000
@@ -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;

=== modified file 'mysql-test/r/rpl_killed_ddl.result'
--- a/mysql-test/r/rpl_killed_ddl.result	2009-12-09 06:13:56 +0000
+++ b/mysql-test/r/rpl_killed_ddl.result	2009-12-10 03:44:19 +0000
@@ -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;

=== modified file 'mysql-test/t/rpl_killed_ddl.test'
--- a/mysql-test/t/rpl_killed_ddl.test	2009-12-09 06:13:56 +0000
+++ b/mysql-test/t/rpl_killed_ddl.test	2009-12-10 03:44:19 +0000
@@ -203,6 +203,11 @@ source include/kill_query_and_diff_maste
 
 ######## 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 //;


Attachment: [text/bzr-bundle] bzr/[e-mail]