From 0977734cee1c8197adf747bcc4bd89a91266fe74 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Mon, 8 Jul 2013 18:35:44 -0700 Subject: Fixed all remaining failures in partition tests. Commented out the test case for bug 50036 as it was done in mysql-5.6.10. --- mysql-test/t/partition_debug_sync.test | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mysql-test/t/partition_debug_sync.test') diff --git a/mysql-test/t/partition_debug_sync.test b/mysql-test/t/partition_debug_sync.test index 027a4bd19a7..694c95bfa0e 100644 --- a/mysql-test/t/partition_debug_sync.test +++ b/mysql-test/t/partition_debug_sync.test @@ -32,16 +32,17 @@ ENGINE = MYISAM PARTITION p3 VALUES LESS THAN MAXVALUE ) */; SET SESSION debug_dbug= "+d,sleep_before_create_table_no_lock"; SET DEBUG_SYNC= 'alter_table_before_create_table_no_lock SIGNAL removing_partitioning WAIT_FOR waiting_for_alter'; -SET DEBUG_SYNC= 'alter_table_before_main_binlog SIGNAL partitioning_removed'; +SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL waiting_for_upgrade'; --send ALTER TABLE t1 REMOVE PARTITIONING connection default; --echo # Con default SET DEBUG_SYNC= 'now WAIT_FOR removing_partitioning'; SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL waiting_for_alter'; -SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table WAIT_FOR partitioning_removed'; +SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table WAIT_FOR waiting_for_upgrade'; DROP TABLE IF EXISTS t1; --echo # Con 1 connection con1; +--error ER_LOCK_DEADLOCK --reap SET SESSION debug_dbug= "-d,sleep_before_create_table_no_lock"; connection default; -- cgit v1.2.1