From 571f8be43057e82eda6cd5250ebb2c36b0ba8aea Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Mon, 5 Nov 2007 17:20:10 +0200
Subject: [PATCH 1/9] Bug #28597 Replication doesn't start after upgrading to
 5.1.18

Since bug@20166, which replaced the binlog file name generating to base
on pidfile_name instead of the previous glob_hostname, the binlog file
name suddenly started to be stored solely in the absolute path format,
including a case when --log-bin option meant a relative path.
What's more serious, the path for binlog file can lead unrequestedly
to pid-file directory so that after any proper fix for this bug
there might be similar to the bug report consequences for one who
upgrades from post-fix-bug@20166-pre-fix-bug@28597 to post-fix-bug@28597.

Fixed with preserving`pidfile_name' (intr.by bug@20166) but stripping
off its directory part. This restores the original logics of storing
the names in compatible with --log-bin option format and with the
requirement for --log-bin ralative path to corresond to the data directory.
Side effects for this fix:

effective fixing bug@27070, refining its test;
ensuring no overrun for buff can happen anymore (Bug#31836
insufficient space reserved for the suffix of relay log file name);
bug#31837  --remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql missed
in rpl_temporary.test;
fixes Bug@28603  Invalid log-bin default location;
---
 mysql-test/t/rpl_dual_pos_advance.test |  6 ------
 mysql-test/t/rpl_temporary.test        |  2 ++
 sql/log.cc                             | 11 ++++-------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mysql-test/t/rpl_dual_pos_advance.test b/mysql-test/t/rpl_dual_pos_advance.test
index 074aeec63b1..518fa9df885 100644
--- a/mysql-test/t/rpl_dual_pos_advance.test
+++ b/mysql-test/t/rpl_dual_pos_advance.test
@@ -106,9 +106,3 @@ connection slave;
 sync_with_master;
 
 # End of 4.1 tests
-
-# Cleanup
-# The A->B->A replication causes the master to start writing relay logs
-# in var/run, remove them
-remove_file $MYSQLTEST_VARDIR/run/master-relay-bin.000001;
-remove_file $MYSQLTEST_VARDIR/run/master-relay-bin.index;
diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index d09049af217..a7a15aebe7a 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -211,6 +211,8 @@ select * from t1;
 connection master; 
 drop table t1;
 
+--remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql
+
 # Delete the anonymous users
 source include/delete_anonymous_users.inc;
 
diff --git a/sql/log.cc b/sql/log.cc
index e9aa273676a..af03cecd462 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -448,13 +448,10 @@ const char *MYSQL_LOG::generate_name(const char *log_name,
 {
   if (!log_name || !log_name[0])
   {
-    /*
-      TODO: The following should be using fn_format();  We just need to
-      first change fn_format() to cut the file name if it's too long.
-    */
-    strmake(buff, pidfile_name,FN_REFLEN-5);
-    strmov(fn_ext(buff),suffix);
-    return (const char *)buff;
+    strmake(buff, pidfile_name, FN_REFLEN - strlen(suffix) - 1);
+    return (const char *)
+      fn_format(buff, buff, "", suffix, MYF(MY_REPLACE_EXT|MY_REPLACE_DIR));
+
   }
   // get rid of extension if the log is binary to avoid problems
   if (strip_ext)

From d9045a76687fdafd1b5d3a649c8d72edc48cfd9a Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Tue, 6 Nov 2007 11:53:47 +0200
Subject: [PATCH 2/9] bug#27571

non-deterministic tests execution on some platforms.
---
 mysql-test/suite/binlog/r/binlog_killed.result | 5 ++++-
 mysql-test/suite/binlog/t/binlog_killed.test   | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/binlog/r/binlog_killed.result b/mysql-test/suite/binlog/r/binlog_killed.result
index 9e8f9828d9f..3cd21e3bca1 100644
--- a/mysql-test/suite/binlog/r/binlog_killed.result
+++ b/mysql-test/suite/binlog/r/binlog_killed.result
@@ -9,6 +9,9 @@ insert into t2 values (null, null), (null, get_lock("a", 10));
 select @result /* must be zero either way */;
 @result
 0
+select RELEASE_LOCK("a");
+RELEASE_LOCK("a")
+1
 delete from t1;
 delete from t2;
 insert into t1 values (1,1),(2,2);
@@ -51,7 +54,7 @@ RETURNS int(11)
 DETERMINISTIC
 begin
 if @b > 0 then
-select get_lock("a", 10)  into @a;
+select get_lock("a", 20)  into @a;
 else 
 set @b= 1;
 end if;
diff --git a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test
index 4c2e6fbdc3c..4810246437f 100644
--- a/mysql-test/suite/binlog/t/binlog_killed.test
+++ b/mysql-test/suite/binlog/t/binlog_killed.test
@@ -57,6 +57,8 @@ select @result /* must be zero either way */;
 
 
 --remove_file $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
+connection con1;
+select RELEASE_LOCK("a");
 
 #
 # bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
@@ -192,7 +194,7 @@ RETURNS int(11)
 DETERMINISTIC
 begin
   if @b > 0 then
-     select get_lock("a", 10)  into @a;
+     select get_lock("a", 20)  into @a;
   else 
      set @b= 1;
   end if;
@@ -220,7 +222,7 @@ connection con1;
 eval kill query $ID;
 
 connection con2;
---error 0,ER_QUERY_INTERRUPTED
+--error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
 reap;
 select * from t4 order by b /* must be (1,1), (1,2) */;
 select @b  /* must be 1 at the end of a stmt calling bug27563() */;
@@ -263,7 +265,7 @@ connection con1;
 eval kill query $ID;
 
 connection con2;
---error 0,ER_QUERY_INTERRUPTED
+--error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
 reap;
 select count(*) from t4 /* must be 1 */;
 select @b  /* must be 1 at the end of a stmt calling bug27563() */;

From fe60ebdc2550d04824f5106b2b053c66016a6e8d Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Tue, 6 Nov 2007 13:08:37 +0200
Subject: [PATCH 3/9] bug#27571

non-deterministic tests refining.
This particular patch tested on two archs.
---
 mysql-test/suite/binlog/t/binlog_killed.test | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test
index 4810246437f..c8809648098 100644
--- a/mysql-test/suite/binlog/t/binlog_killed.test
+++ b/mysql-test/suite/binlog/t/binlog_killed.test
@@ -218,11 +218,15 @@ set @b= 0;
 send update t4 set b=b + bug27563(b);
 
 connection con1;
+let $wait_condition= select count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
+source include/wait_condition.inc;
+select count(*) FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
+
 --replace_result $ID ID
 eval kill query $ID;
 
 connection con2;
---error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
+--error ER_QUERY_INTERRUPTED
 reap;
 select * from t4 order by b /* must be (1,1), (1,2) */;
 select @b  /* must be 1 at the end of a stmt calling bug27563() */;
@@ -261,11 +265,14 @@ set @b= 0;
 send delete from t4 where b=bug27563(1) or b=bug27563(2);
 
 connection con1;
+let $wait_condition= select count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
+source include/wait_condition.inc;
+select count(*) FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
 --replace_result $ID ID
 eval kill query $ID;
 
 connection con2;
---error 0,ER_QUERY_INTERRUPTED,ER_SP_PROC_TABLE_CORRUPT
+--error ER_QUERY_INTERRUPTED
 reap;
 select count(*) from t4 /* must be 1 */;
 select @b  /* must be 1 at the end of a stmt calling bug27563() */;

From 122005894f865c13f46b460adc1c0885a78f0c0c Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Tue, 6 Nov 2007 13:53:26 +0200
Subject: [PATCH 4/9] bug#27571

commit is specific for 5.0 to eliminated non-deterministic tests.
Those tests run only in 5.1 env where there is a necessary devices such
as processlist table of info_schema.
---
 mysql-test/r/binlog_killed.result        |  76 +--------------
 mysql-test/t/binlog_killed.test          | 118 +++--------------------
 mysql-test/t/binlog_killed_simulate.test |   1 +
 3 files changed, 19 insertions(+), 176 deletions(-)

diff --git a/mysql-test/r/binlog_killed.result b/mysql-test/r/binlog_killed.result
index ddd80283eca..eaafc9727cd 100644
--- a/mysql-test/r/binlog_killed.result
+++ b/mysql-test/r/binlog_killed.result
@@ -9,6 +9,9 @@ insert into t2 values (null, null), (null, get_lock("a", 10));
 select @result /* must be zero either way */;
 @result
 0
+select RELEASE_LOCK("a");
+RELEASE_LOCK("a")
+1
 delete from t1;
 delete from t2;
 insert into t1 values (1,1),(2,2);
@@ -17,8 +20,7 @@ update t1 set b=11 where a=2;
 update t1 set b=b+10;
 kill query ID;
 rollback;
-ERROR 70100: Query execution was interrupted
-select * from t1 /* must be the same as before (1,1),(2,2) */;
+select * from t1  order by a /* must be the same as before (1,1),(2,2) */;
 a	b
 1	1
 2	2
@@ -27,8 +29,7 @@ delete from t1 where a=2;
 delete from t1 where a=2;
 kill query ID;
 rollback;
-ERROR 70100: Query execution was interrupted
-select * from t1 /* must be the same as before (1,1),(2,2) */;
+select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
 a	b
 1	1
 2	2
@@ -41,78 +42,11 @@ begin;
 insert into t1 select * from t4 for update;
 kill query ID;
 rollback;
-ERROR 70100: Query execution was interrupted
 rollback;
 select * from t1 /* must be the same as before (1,1),(2,2) */;
 a	b
 1	1
 2	2
 drop table t4;
-create function bug27563(n int) 
-RETURNS int(11)
-DETERMINISTIC
-begin
-if n > 1 then
-select get_lock("a", 10)  into @a;
-end if;
-return n;
-end|
-delete from t2;
-insert into t2 values (1,1), (2,2);
-reset master;
-select get_lock("a", 20);
-get_lock("a", 20)
-1
-update t2 set b=b + bug27563(b) order by a;
-kill query ID;
-ERROR 70100: Query execution was interrupted
-select * from t2 /* must be (1,2), (2,2) */;
-a	b
-1	2
-2	2
-show master status  /* must have the update event more to FD */;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	211		
-select
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null
-1
-select 0 /* must return 0 to mean the killed query is in */;
-0
-0
-select RELEASE_LOCK("a");
-RELEASE_LOCK("a")
-1
-delete from t2;
-insert into t2 values (1,1), (2,2);
-reset master;
-select get_lock("a", 20);
-get_lock("a", 20)
-1
-delete from t2 where a=1 or a=bug27563(2) order by a;
-kill query ID;
-ERROR 70100: Query execution was interrupted
-select * from t2 /* must be (1,2), (2,2) */;
-a	b
-1	1
-2	2
-show master status  /* must have the update event more to FD */;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	98		
-select
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null
-1
-select 0 /* must return 0 to mean the killed query is in */;
-0
-0
-select RELEASE_LOCK("a");
-RELEASE_LOCK("a")
-1
-drop function bug27563;
 drop table t1,t2,t3;
 end of the tests
diff --git a/mysql-test/t/binlog_killed.test b/mysql-test/t/binlog_killed.test
index 0e35e46c845..f8ba7c00f48 100644
--- a/mysql-test/t/binlog_killed.test
+++ b/mysql-test/t/binlog_killed.test
@@ -57,6 +57,8 @@ select @result /* must be zero either way */;
 
 
 --remove_file $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
+connection con1;
+select RELEASE_LOCK("a");
 
 #
 # bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
@@ -68,7 +70,6 @@ select @result /* must be zero either way */;
 delete from t1;
 delete from t2;
 insert into t1 values (1,1),(2,2);
-let $ID= `select connection_id()`;
 
 #
 # simple update
@@ -77,6 +78,7 @@ connection con1;
 begin; update t1 set b=11 where a=2;
 
 connection con2;
+let $ID= `select connection_id()`;
 send update t1 set b=b+10;
 
 connection con1;
@@ -85,9 +87,9 @@ eval kill query $ID;
 rollback;
 
 connection con2;
---error ER_QUERY_INTERRUPTED
+--error 0,ER_QUERY_INTERRUPTED
 reap;
-select * from t1 /* must be the same as before (1,1),(2,2) */;
+select * from t1  order by a /* must be the same as before (1,1),(2,2) */;
 
 #
 # multi update
@@ -120,6 +122,7 @@ connection con1;
 begin; delete from t1 where a=2;
 
 connection con2;
+let $ID= `select connection_id()`;
 send delete from t1 where a=2;
 
 connection con1;
@@ -128,9 +131,9 @@ eval kill query $ID;
 rollback;
 
 connection con2;
---error ER_QUERY_INTERRUPTED
+--error 0,ER_QUERY_INTERRUPTED
 reap;
-select * from t1 /* must be the same as before (1,1),(2,2) */;
+select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
 
 #
 # multi delete
@@ -163,6 +166,7 @@ insert into t4 values (3, 3);
 begin; insert into t1 values (3, 3);
 
 connection con2;
+let $ID= `select connection_id()`;
 begin;
 send insert into t1 select * from t4 for update;
 
@@ -172,7 +176,7 @@ eval kill query $ID;
 rollback;
 
 connection con2;
---error ER_QUERY_INTERRUPTED
+--error 0,ER_QUERY_INTERRUPTED
 reap;
 rollback;
 select * from t1 /* must be the same as before (1,1),(2,2) */;
@@ -182,106 +186,10 @@ drop table t4; # cleanup for the sub-case
 ###
 ## non-ta table case: killing must be recorded in binlog
 ###
-delimiter |;
-create function bug27563(n int) 
-RETURNS int(11)
-DETERMINISTIC
-begin
-  if n > 1 then
-     select get_lock("a", 10)  into @a;
-  end if;
-  return n;
-end|
-delimiter ;|
 
-#
-# update
-#
-
-delete from t2;
-insert into t2 values (1,1), (2,2);
-reset master;
-connection con1;
-select get_lock("a", 20);
-
-connection con2;
-let $ID= `select connection_id()`;
-send update t2 set b=b + bug27563(b) order by a;
-
-connection con1;
---replace_result $ID ID
-eval kill query $ID;
-
-connection con2;
---error ER_QUERY_INTERRUPTED
-reap;
-select * from t2 /* must be (1,2), (2,2) */;
-show master status  /* must have the update event more to FD */;
-
-# a proof the query is binlogged with an error
-
---exec $MYSQL_BINLOG --start-position=98 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval select
-(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`;
-eval select $error_code /* must return 0 to mean the killed query is in */;
-
-# cleanup for the sub-case
-connection con1;
-select RELEASE_LOCK("a");
---remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
-
-#
-# delete
-#
-
-delete from t2;
-insert into t2 values (1,1), (2,2);
-reset master;
-connection con1;
-select get_lock("a", 20);
-
-connection con2;
-let $ID= `select connection_id()`;
-send delete from t2 where a=1 or a=bug27563(2) order by a;
-
-connection con1;
---replace_result $ID ID
-eval kill query $ID;
-
-connection con2;
---error ER_QUERY_INTERRUPTED
-reap;
-select * from t2 /* must be (1,2), (2,2) */;
-show master status  /* must have the update event more to FD */;
-
-# a proof the query is binlogged with an error
-
---exec $MYSQL_BINLOG --start-position=98 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval select
-(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-let $error_code= `select @a like "%#%error_code=0%" /* must return 0*/`;
-eval select $error_code /* must return 0 to mean the killed query is in */;
-
-# cleanup for the sub-case
-connection con1;
-select RELEASE_LOCK("a");
---remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
-
-#
-# load data - see simulation tests
-#
-
-
-# bug#27571 cleanup
-
-drop function bug27563;
+# In order to be deterministic the test needs INFORMATION_SCHEMA.PROCESSLIST
+# which is not available on 5.0 at this time.
+# Therefore, skip this part on 5.0.
 
 
 #
diff --git a/mysql-test/t/binlog_killed_simulate.test b/mysql-test/t/binlog_killed_simulate.test
index d6234d1bfd7..670cd756803 100644
--- a/mysql-test/t/binlog_killed_simulate.test
+++ b/mysql-test/t/binlog_killed_simulate.test
@@ -1,3 +1,4 @@
+-- source include/have_debug.inc
 #
 # bug#27571 asynchronous setting mysql_$query()'s local error and 
 #           Query_log_event::error_code

From 84d4f588cbfa573382968e30df43730e47a8a1b0 Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Tue, 6 Nov 2007 15:11:59 +0200
Subject: [PATCH 5/9] bug#27571

removing extra tests (on 5.1 that's been already done)
---
 .../t/binlog_killed_bug27571-master.opt       |  1 -
 mysql-test/t/binlog_killed_bug27571.test      | 68 -------------------
 2 files changed, 69 deletions(-)
 delete mode 100644 mysql-test/t/binlog_killed_bug27571-master.opt
 delete mode 100644 mysql-test/t/binlog_killed_bug27571.test

diff --git a/mysql-test/t/binlog_killed_bug27571-master.opt b/mysql-test/t/binlog_killed_bug27571-master.opt
deleted file mode 100644
index d269cf246d5..00000000000
--- a/mysql-test/t/binlog_killed_bug27571-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---loose-debug=d,stop_after_row_loop_done
diff --git a/mysql-test/t/binlog_killed_bug27571.test b/mysql-test/t/binlog_killed_bug27571.test
deleted file mode 100644
index 6fa3c6d256f..00000000000
--- a/mysql-test/t/binlog_killed_bug27571.test
+++ /dev/null
@@ -1,68 +0,0 @@
---source include/have_innodb.inc
---source include/not_embedded.inc
---source include/have_log_bin.inc
-
-#
-# bug#27571 asynchronous setting mysql_`query`::error and Query_log_e::error_code
-# 
-# Checking that if killing happens inbetween of the end of rows loop and
-# recording into binlog that will not lead to recording any error incl 
-# the killed error.
-#
-
-connect (looser, localhost, root,,);
-connect (killer, localhost, root,,);
-
-create table t1 (a int auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB;
-
-delete from t1;
-insert into t1 values (1,1),(2,2);
-reset master;
-
-connection looser;
-let $ID= `select connection_id()`;
-send update t1 set b=11 where a=2;
-
-connection killer;
-sleep 1; # let 1 second for the update to get to the sleeping point
---replace_result $ID ID
-eval kill query $ID;
-
-connection looser;
---error 0 # zero even though the query must be got killed while it was sleepin for 5 secs
-reap;
-
-#
-# this is another possible artifact. The killed error was not caught
-# as that is logical as killing was not effective:
-# data are ok and well as binlog event is without killed error (further).
-# The reason of the following `show error' is to prove that 
-# killing simulation was effective
-#
-show errors; 
-
-connection killer;
-
-# nothing is rolled back
-
-select * from t1 where a=2 /* must be 11 */;
-
-# a proof the query is binlogged with an error
-
---exec $MYSQL_BINLOG --start-position=98 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-eval select
-(@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-let $error_code= `select @a like "%#%error_code=0%"`;
-
-eval select $error_code  /* must return 1*/;
-
-#
-# cleanup
-#
-
-drop table t1;
-
---echo end of the tests

From a179cf154054127beadb095f181db3eba4e9cd7d Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Tue, 6 Nov 2007 16:25:32 +0200
Subject: [PATCH 6/9] bug#27571

fixing tests
---
 mysql-test/r/binlog_killed_simulate.result | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 mysql-test/r/binlog_killed_simulate.result

diff --git a/mysql-test/r/binlog_killed_simulate.result b/mysql-test/r/binlog_killed_simulate.result
new file mode 100644
index 00000000000..a21ac5b1e32
--- /dev/null
+++ b/mysql-test/r/binlog_killed_simulate.result
@@ -0,0 +1,33 @@
+drop table if exists t1,t2;
+create table t1  (a int) engine=MyISAM;
+insert into t1 set a=1;
+reset master;
+update t1 set a=2 /* will be "killed" after work has been done */;
+select
+(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
+is not null;
+(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
+is not null
+1
+select 1 /* must return 1 as query completed before got killed*/;
+1
+1
+create table t2 (a int, b int) ENGINE=MyISAM;
+reset master;
+load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */;
+ERROR 70100: Query execution was interrupted
+show binlog events from 98;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	98	Begin_load_query	1	#	;file_id=1;block_len=12
+master-bin.000001	133	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=1
+select
+(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
+is not null;
+(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
+is not null
+1
+select 0 /* must return 0 to mean the killed query is in */;
+0
+0
+drop table t1,t2;
+end of the tests

From ba8fc4fed1c4e618d1dada748b83fc4fc181a3f1 Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Tue, 6 Nov 2007 16:32:55 +0200
Subject: [PATCH 7/9] results from 5.0 is not needed

---
 mysql-test/r/binlog_killed_simulate.result | 33 ----------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 mysql-test/r/binlog_killed_simulate.result

diff --git a/mysql-test/r/binlog_killed_simulate.result b/mysql-test/r/binlog_killed_simulate.result
deleted file mode 100644
index a21ac5b1e32..00000000000
--- a/mysql-test/r/binlog_killed_simulate.result
+++ /dev/null
@@ -1,33 +0,0 @@
-drop table if exists t1,t2;
-create table t1  (a int) engine=MyISAM;
-insert into t1 set a=1;
-reset master;
-update t1 set a=2 /* will be "killed" after work has been done */;
-select
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null
-1
-select 1 /* must return 1 as query completed before got killed*/;
-1
-1
-create table t2 (a int, b int) ENGINE=MyISAM;
-reset master;
-load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */;
-ERROR 70100: Query execution was interrupted
-show binlog events from 98;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Begin_load_query	1	#	;file_id=1;block_len=12
-master-bin.000001	133	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=1
-select
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null;
-(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
-is not null
-1
-select 0 /* must return 0 to mean the killed query is in */;
-0
-0
-drop table t1,t2;
-end of the tests

From 904db2cf960749916b3b8cd18304387d0330e399 Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Tue, 6 Nov 2007 20:09:45 +0200
Subject: [PATCH 8/9] bug#27571

tests fixing: refreshing the results file.
---
 mysql-test/suite/binlog/r/binlog_killed.result | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mysql-test/suite/binlog/r/binlog_killed.result b/mysql-test/suite/binlog/r/binlog_killed.result
index 3cd21e3bca1..35b1eaea4b7 100644
--- a/mysql-test/suite/binlog/r/binlog_killed.result
+++ b/mysql-test/suite/binlog/r/binlog_killed.result
@@ -68,7 +68,11 @@ get_lock("a", 20)
 1
 set @b= 0;
 update t4 set b=b + bug27563(b);
+select count(*) FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
+count(*)
+1
 kill query ID;
+ERROR 70100: Query execution was interrupted
 select * from t4 order by b /* must be (1,1), (1,2) */;
 a	b
 1	1
@@ -101,7 +105,11 @@ get_lock("a", 20)
 1
 set @b= 0;
 delete from t4 where b=bug27563(1) or b=bug27563(2);
+select count(*) FROM INFORMATION_SCHEMA.PROCESSLIST where state='User lock';
+count(*)
+1
 kill query ID;
+ERROR 70100: Query execution was interrupted
 select count(*) from t4 /* must be 1 */;
 count(*)
 1

From b9e4fdb2806f430fc7311cc1ba9316d355e0b573 Mon Sep 17 00:00:00 2001
From: "aelkin/elkin@koti.dsl.inet.fi" <>
Date: Tue, 6 Nov 2007 20:31:40 +0200
Subject: [PATCH 9/9] bug#27571

refining non-deterministic tests.
The new Bug@32148 is in the way. Adjuting the tests to be somehow useful.
---
 mysql-test/r/binlog_killed.result |  4 ++++
 mysql-test/t/binlog_killed.test   | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/mysql-test/r/binlog_killed.result b/mysql-test/r/binlog_killed.result
index eaafc9727cd..e04cc192876 100644
--- a/mysql-test/r/binlog_killed.result
+++ b/mysql-test/r/binlog_killed.result
@@ -17,18 +17,22 @@ delete from t2;
 insert into t1 values (1,1),(2,2);
 begin;
 update t1 set b=11 where a=2;
+begin;
 update t1 set b=b+10;
 kill query ID;
 rollback;
+rollback;
 select * from t1  order by a /* must be the same as before (1,1),(2,2) */;
 a	b
 1	1
 2	2
 begin;
 delete from t1 where a=2;
+begin;
 delete from t1 where a=2;
 kill query ID;
 rollback;
+rollback;
 select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
 a	b
 1	1
diff --git a/mysql-test/t/binlog_killed.test b/mysql-test/t/binlog_killed.test
index f8ba7c00f48..af78adf0abc 100644
--- a/mysql-test/t/binlog_killed.test
+++ b/mysql-test/t/binlog_killed.test
@@ -79,6 +79,7 @@ begin; update t1 set b=11 where a=2;
 
 connection con2;
 let $ID= `select connection_id()`;
+begin;
 send update t1 set b=b+10;
 
 connection con1;
@@ -86,9 +87,18 @@ connection con1;
 eval kill query $ID;
 rollback;
 
+# Bug #32148  	killi query may be ineffective 
+# forced to comment out the test's outcome 
+# and mask out ineffective ER_QUERY_INTERRUPTED
+# todo1: revert back upon fixing bug#32148
+# todo2: the tests need refining in that
+#        killing should wait till the victim requested
+#        its lock (wait_condition available in 5.1 tests)
+
 connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
+rollback;
 select * from t1  order by a /* must be the same as before (1,1),(2,2) */;
 
 #
@@ -123,6 +133,7 @@ begin; delete from t1 where a=2;
 
 connection con2;
 let $ID= `select connection_id()`;
+begin;
 send delete from t1 where a=2;
 
 connection con1;
@@ -133,8 +144,11 @@ rollback;
 connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
+rollback;
+# todo1,2 above
 select * from t1 order by a /* must be the same as before (1,1),(2,2) */;
 
+
 #
 # multi delete
 # the same as for multi-update
@@ -178,6 +192,7 @@ rollback;
 connection con2;
 --error 0,ER_QUERY_INTERRUPTED
 reap;
+# todo 1,2 above
 rollback;
 select * from t1 /* must be the same as before (1,1),(2,2) */;