summaryrefslogtreecommitdiff
path: root/mysql-test/t/partition_sync.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t/partition_sync.test')
-rw-r--r--mysql-test/t/partition_sync.test67
1 files changed, 35 insertions, 32 deletions
diff --git a/mysql-test/t/partition_sync.test b/mysql-test/t/partition_sync.test
index a732b35b8b9..5d2b25e87f3 100644
--- a/mysql-test/t/partition_sync.test
+++ b/mysql-test/t/partition_sync.test
@@ -2,38 +2,41 @@
# Save the initial number of concurrent sessions.
--source include/count_sessions.inc
---echo #
---echo # Bug #43867 ALTER TABLE on a partitioned table
---echo # causes unnecessary deadlocks
---echo #
-
-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);
-
-connect(con1,localhost,root);
-
---echo # Connection 2
-connection con1;
-BEGIN;
-SELECT * FROM t1;
-
---echo # Connection 1
-connection default;
---error ER_DROP_PARTITION_NON_EXISTENT
-ALTER TABLE t1 DROP PARTITION p3;
-
---echo # Connection 2
-connection con1;
---echo # This failed with deadlock and should not do so.
-SELECT * FROM t1;
-
---echo # Connection 1
-connection default;
-disconnect con1;
-DROP TABLE t1;
+--echo # Disabled until Bug#46654 False deadlock on concurrent DML/DDL
+--echo # with partitions, inconsistent behavior is backported
+
+#--echo #
+#--echo # Bug #43867 ALTER TABLE on a partitioned table
+#--echo # causes unnecessary deadlocks
+#--echo #
+#
+#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);
+#
+#connect(con1,localhost,root);
+#
+#--echo # Connection 2
+#connection con1;
+#BEGIN;
+#SELECT * FROM t1;
+#
+#--echo # Connection 1
+#connection default;
+#--error ER_DROP_PARTITION_NON_EXISTENT
+#ALTER TABLE t1 DROP PARTITION p3;
+#
+#--echo # Connection 2
+#connection con1;
+#--echo # This failed with deadlock and should not do so.
+#SELECT * FROM t1;
+#
+#--echo # Connection 1
+#connection default;
+#disconnect con1;
+#DROP TABLE t1;
# Check that all connections opened by test cases in this file are really