fixes for sys_vars and pbxt suites

2 files changed, 0 insertions, 46 deletions

diff --git a/mysql-test/suite/pbxt/r/lock_multi.result b/mysql-test/suite/pbxt/r/lock_multi.result
index b860da24e64..29010d93bfe 100644
--- a/mysql-test/suite/pbxt/r/lock_multi.result
+++ b/mysql-test/suite/pbxt/r/lock_multi.result
@@ -138,17 +138,6 @@ unlock tables;
 unlock tables;
 drop table t1,t2;
 End of 5.0 tests
-create table t1 (i int);
-lock table t1 read;
-update t1 set i= 10;
-select * from t1;
-Timeout in wait_condition.inc for select count(*) = 1 from information_schema.processlist
-where state = "Table Lock" and info = "select * from t1"
-kill query ID;
-i
-ERROR 70100: Query execution was interrupted
-unlock tables;
-drop table t1;
 drop table if exists t1;
 create table t1 (i int);
 connection: default
diff --git a/mysql-test/suite/pbxt/t/lock_multi.test b/mysql-test/suite/pbxt/t/lock_multi.test
index 82188e36098..b15e6c9dea3 100644
--- a/mysql-test/suite/pbxt/t/lock_multi.test
+++ b/mysql-test/suite/pbxt/t/lock_multi.test
@@ -416,41 +416,6 @@ drop table t1,t2;
 --echo End of 5.0 tests
 
 
-#
-# Bug#21281 Pending write lock is incorrectly removed when its
-#           statement being KILLed
-#
-create table t1 (i int);
-connection locker;
-lock table t1 read;
-connection writer;
-send
-update t1 set i= 10;
-connection reader;
-let $wait_condition=
-  select count(*) = 1 from information_schema.processlist
-  where state = "Table Lock" and info = "update t1 set i= 10";
---source include/wait_condition.inc
-send
-select * from t1;
-connection default;
-let $wait_condition=
-  select count(*) = 1 from information_schema.processlist
-  where state = "Table Lock" and info = "select * from t1";
---source include/wait_condition.inc
-let $ID= `select id from information_schema.processlist where state = "Table Lock" and info = "update t1 set i= 10"`;
---replace_result $ID ID
-eval kill query $ID;
-connection reader;
---reap
-connection writer;
---error ER_QUERY_INTERRUPTED
---reap
-connection locker;
-unlock tables;
-connection default;
-drop table t1;
-
 # Disconnect sessions used in many subtests above
 disconnect locker;
 disconnect reader;