From 4bce198ce9404c1d3bbdf5376ffc97a882013da6 Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Tue, 2 Mar 2010 00:05:30 +0100 Subject: manual merge fix of bug#42438 in mysql-next-mr-merge --- mysql-test/r/partition_debug_sync.result | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'mysql-test/r/partition_debug_sync.result') diff --git a/mysql-test/r/partition_debug_sync.result b/mysql-test/r/partition_debug_sync.result index 5eb19f42395..5ab1044934b 100644 --- a/mysql-test/r/partition_debug_sync.result +++ b/mysql-test/r/partition_debug_sync.result @@ -4,6 +4,8 @@ SET DEBUG_SYNC= 'RESET'; # Bug#42438: Crash ha_partition::change_table_ptr # Test when remove partitioning is done while drop table is waiting # for the table. +# After MDL was introduced, there is no longer any race, so test is done +# by adding a small sleep to verify that the delete waits. # Con 1 SET DEBUG_SYNC= 'RESET'; CREATE TABLE t1 @@ -16,21 +18,25 @@ ENGINE = MYISAM PARTITION p1 VALUES LESS THAN (20), PARTITION p2 VALUES LESS THAN (100), PARTITION p3 VALUES LESS THAN MAXVALUE ) */; +SET SESSION debug= "+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'; ALTER TABLE t1 REMOVE PARTITIONING; # Con default SET DEBUG_SYNC= 'now WAIT_FOR removing_partitioning'; -SET DEBUG_SYNC= 'waiting_for_table SIGNAL waiting_for_alter'; +SET DEBUG_SYNC= 'mdl_acquire_lock_wait SIGNAL waiting_for_alter'; SET DEBUG_SYNC= 'rm_table_part2_before_delete_table WAIT_FOR partitioning_removed'; DROP TABLE IF EXISTS t1; # Con 1 +SET SESSION debug= "-d,sleep_before_create_table_no_lock"; SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET'; # # Bug#42438: Crash ha_partition::change_table_ptr # Test when remove partitioning is failing due to drop table is already # in progress. +# After MDL was introduced, there is no longer any race, so test is done +# by adding a small sleep to verify that the alter waits. CREATE TABLE t2 (a INTEGER, b INTEGER NOT NULL, @@ -41,14 +47,16 @@ ENGINE = MYISAM PARTITION p1 VALUES LESS THAN (20), PARTITION p2 VALUES LESS THAN (100), PARTITION p3 VALUES LESS THAN MAXVALUE ) */; -SET DEBUG_SYNC= 'before_lock_tables_takes_lock SIGNAL removing_partitions WAIT_FOR waiting_for_alter'; +SET DEBUG_SYNC= 'open_tables_acquire_upgradable_mdl SIGNAL removing_partitions WAIT_FOR waiting_for_alter'; SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done'; ALTER TABLE t2 REMOVE PARTITIONING; # Con default +SET SESSION debug= "+d,sleep_before_part2_delete_table"; SET DEBUG_SYNC= 'now WAIT_FOR removing_partitions'; -SET DEBUG_SYNC= 'waiting_for_table SIGNAL waiting_for_alter'; +SET DEBUG_SYNC= 'rm_table_part2_before_delete_table SIGNAL waiting_for_alter'; SET DEBUG_SYNC= 'rm_table_part2_before_binlog SIGNAL delete_done'; DROP TABLE IF EXISTS t2; +SET SESSION debug= "-d,sleep_before_part2_delete_table"; # Con 1 ERROR 42S02: Table 'test.t2' doesn't exist SET DEBUG_SYNC= 'RESET'; -- cgit v1.2.1