summaryrefslogtreecommitdiff
path: root/mysql-test/suite/parts/inc/partition_fail.inc
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2010-10-01 15:59:07 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2010-10-01 15:59:07 +0200
commit20606cec590949d29e89224c6469f8ed808f426b (patch)
tree764a51a4ea3b8ec8b3e01fc2779d84dc354e199d /mysql-test/suite/parts/inc/partition_fail.inc
parentfbb49d80ebbd09158e87a0810528250f67018330 (diff)
parent1b5f84db5b2b38428ec662124c9241cf2bd51350 (diff)
downloadmariadb-git-20606cec590949d29e89224c6469f8ed808f426b.tar.gz
Manual merge into mysql-5.5-bugteam
Diffstat (limited to 'mysql-test/suite/parts/inc/partition_fail.inc')
-rw-r--r--mysql-test/suite/parts/inc/partition_fail.inc20
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/suite/parts/inc/partition_fail.inc b/mysql-test/suite/parts/inc/partition_fail.inc
index 2c154a90499..f433712e284 100644
--- a/mysql-test/suite/parts/inc/partition_fail.inc
+++ b/mysql-test/suite/parts/inc/partition_fail.inc
@@ -18,3 +18,23 @@ SHOW CREATE TABLE t1;
--sorted_result
SELECT * FROM t1;
DROP TABLE t1;
+
+--echo # Same test under LOCK TABLE
+--eval $create_statement
+--eval $insert_statement
+--echo # State before failure
+--list_files $DATADIR/test
+SHOW CREATE TABLE t1;
+--sorted_result
+SELECT * FROM t1;
+LOCK TABLE t1 WRITE;
+--disable_abort_on_error
+--eval $fail_statement
+--enable_abort_on_error
+--echo # State after failure
+--list_files $DATADIR/test
+SHOW CREATE TABLE t1;
+--sorted_result
+SELECT * FROM t1;
+UNLOCK TABLES;
+DROP TABLE t1;