summaryrefslogtreecommitdiff
path: root/mysql-test/r/partition_sync.result
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2016-03-25 20:51:22 +0400
committerSergey Vojtovich <svoj@mariadb.org>2016-03-31 10:11:16 +0400
commit282497dd6d1049b4fb963641504c2733752845a7 (patch)
tree7288d17c29fbbe9ac47ec51f6988fb954f59a361 /mysql-test/r/partition_sync.result
parent5052e2479e873461bebfcedbc674bbaf57d3c968 (diff)
downloadmariadb-git-282497dd6d1049b4fb963641504c2733752845a7.tar.gz
MDEV-6720 - enable connection log in mysqltest by default
Diffstat (limited to 'mysql-test/r/partition_sync.result')
-rw-r--r--mysql-test/r/partition_sync.result26
1 files changed, 16 insertions, 10 deletions
diff --git a/mysql-test/r/partition_sync.result b/mysql-test/r/partition_sync.result
index 0e8254e984e..18cc506e849 100644
--- a/mysql-test/r/partition_sync.result
+++ b/mysql-test/r/partition_sync.result
@@ -6,22 +6,24 @@ CREATE TABLE t1 (a int) PARTITION BY RANGE (a)
(PARTITION p0 VALUES LESS THAN (1),
PARTITION p1 VALUES LESS THAN (2));
INSERT INTO t1 VALUES (0),(1);
-# Connection 2
+connect con1,localhost,root;
+connection con1;
BEGIN;
SELECT * FROM t1;
a
0
1
-# Connection 1
+connection default;
ALTER TABLE t1 DROP PARTITION p3;
ERROR HY000: Error in list of partitions to DROP
-# Connection 2
+connection con1;
# This failed with deadlock and should not do so.
SELECT * FROM t1;
a
0
1
-# Connection 1
+connection default;
+disconnect con1;
DROP TABLE t1;
#
# Bug #46654 False deadlock on concurrent DML/DDL
@@ -31,27 +33,31 @@ DROP TABLE IF EXISTS tbl_with_partitions;
CREATE TABLE tbl_with_partitions ( i INT )
PARTITION BY HASH(i);
INSERT INTO tbl_with_partitions VALUES (1);
-# Connection 3
+connect con2,localhost,root;
+connect con3,localhost,root;
+connection con3;
LOCK TABLE tbl_with_partitions READ;
-# Connection 1
# Access table with disabled autocommit
+connection default;
SET AUTOCOMMIT = 0;
SELECT * FROM tbl_with_partitions;
i
1
-# Connection 2
# Alter table, abort after prepare
+connection con2;
set session debug_dbug="+d,abort_copy_table";
ALTER TABLE tbl_with_partitions ADD COLUMN f INT;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-# Connection 1
# Try accessing the table after Alter aborted.
# This used to give ER_LOCK_DEADLOCK.
+connection default;
SELECT * FROM tbl_with_partitions;
i
1
-# Connection 3
+connection con3;
UNLOCK TABLES;
-# Connection 1
# Cleanup
+connection default;
+disconnect con2;
+disconnect con3;
DROP TABLE tbl_with_partitions;