diff options
author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-03-31 16:07:55 +0300 |
---|---|---|
committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-03-31 16:07:55 +0300 |
commit | 292add1cf8efc3ed7580590cfa8c9c2a71bf8e19 (patch) | |
tree | c894bf72e7003882d40151ac02a2f265952d501a /storage/innobase | |
parent | 6f2f0704cb8e621a2df24d62b6ff8a4d35005772 (diff) | |
download | mariadb-git-292add1cf8efc3ed7580590cfa8c9c2a71bf8e19.tar.gz |
Rename the newly added mysql-tests from InnoDB to their proper location.
Diffstat (limited to 'storage/innobase')
-rw-r--r-- | storage/innobase/mysql-test/innodb_bug51920.result | 18 | ||||
-rw-r--r-- | storage/innobase/mysql-test/innodb_bug51920.test | 33 |
2 files changed, 0 insertions, 51 deletions
diff --git a/storage/innobase/mysql-test/innodb_bug51920.result b/storage/innobase/mysql-test/innodb_bug51920.result deleted file mode 100644 index 8d919b431b0..00000000000 --- a/storage/innobase/mysql-test/innodb_bug51920.result +++ /dev/null @@ -1,18 +0,0 @@ -CREATE TABLE bug51920 (i INT) ENGINE=InnoDB; -INSERT INTO bug51920 VALUES (1); -BEGIN; -SELECT * FROM bug51920 FOR UPDATE; -i -1 -UPDATE bug51920 SET i=2; -SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST -WHERE INFO="UPDATE bug51920 SET i=2" -INTO @thread_id; -KILL @thread_id; -SELECT sleep(2); -sleep(2) -0 -SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@thread_id; -ID USER HOST DB COMMAND TIME STATE INFO -ERROR 70100: Query execution was interrupted -DROP TABLE bug51920; diff --git a/storage/innobase/mysql-test/innodb_bug51920.test b/storage/innobase/mysql-test/innodb_bug51920.test deleted file mode 100644 index 4f22d7f0d06..00000000000 --- a/storage/innobase/mysql-test/innodb_bug51920.test +++ /dev/null @@ -1,33 +0,0 @@ -# -# Bug #51920: InnoDB connections in lock wait ignore KILL until timeout -# --- source include/not_embedded.inc --- source include/have_innodb.inc - -CREATE TABLE bug51920 (i INT) ENGINE=InnoDB; -INSERT INTO bug51920 VALUES (1); - -BEGIN; -SELECT * FROM bug51920 FOR UPDATE; - -connect (con1,localhost,root,,); - -connection con1; ---send -UPDATE bug51920 SET i=2; - -connection default; -SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST -WHERE INFO="UPDATE bug51920 SET i=2" -INTO @thread_id; - -KILL @thread_id; -SELECT sleep(2); -SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID=@thread_id; - -connection con1; --- error ER_QUERY_INTERRUPTED -reap; -connection default; -DROP TABLE bug51920; --- disconnect con1 |