1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify test case

Browse Source
This commit is contained in:
Sergei Golubchik 2013-04-07 15:36:37 +02:00
parent ccc9238335
commit 028ce66c9e
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/partition_debug_sync.result
View File

@ -42,21 +42,18 @@ CREATE TABLE t2
b INTEGER NOT NULL, b INTEGER NOT NULL,
KEY (b)) KEY (b))
ENGINE = MYISAM ENGINE = MYISAM
/*!50100 PARTITION BY RANGE (a) PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (2),
(PARTITION p0 VALUES LESS THAN (2),
PARTITION p1 VALUES LESS THAN (20), PARTITION p1 VALUES LESS THAN (20),
PARTITION p2 VALUES LESS THAN (100), PARTITION p2 VALUES LESS THAN (100),
PARTITION p3 VALUES LESS THAN MAXVALUE ) */; PARTITION p3 VALUES LESS THAN MAXVALUE);
SET DEBUG_SYNC= 'alter_table_before_open_tables SIGNAL removing_partitions WAIT_FOR waiting_for_alter'; SET DEBUG_SYNC= 'alter_table_before_open_tables SIGNAL removing_partitions WAIT_FOR waiting_for_alter';
SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done'; SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done';
ALTER TABLE t2 REMOVE PARTITIONING; ALTER TABLE t2 REMOVE PARTITIONING;
# Con default # Con default
SET SESSION debug_dbug= "+d,sleep_before_no_locks_delete_table";
SET DEBUG_SYNC= 'now WAIT_FOR removing_partitions'; SET DEBUG_SYNC= 'now WAIT_FOR removing_partitions';
SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table SIGNAL waiting_for_alter'; SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table SIGNAL waiting_for_alter';
SET DEBUG_SYNC= 'rm_table_no_locks_before_binlog SIGNAL delete_done'; SET DEBUG_SYNC= 'rm_table_no_locks_before_binlog SIGNAL delete_done';
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
SET SESSION debug_dbug= "-d,sleep_before_no_locks_delete_table";
# Con 1 # Con 1
ERROR 42S02: Table 'test.t2' doesn't exist ERROR 42S02: Table 'test.t2' doesn't exist
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';

7
mysql-test/t/partition_debug_sync.test
View File

@ -60,22 +60,19 @@ CREATE TABLE t2
b INTEGER NOT NULL, b INTEGER NOT NULL,
KEY (b)) KEY (b))
ENGINE = MYISAM ENGINE = MYISAM
/*!50100 PARTITION BY RANGE (a) PARTITION BY RANGE (a) (PARTITION p0 VALUES LESS THAN (2),
(PARTITION p0 VALUES LESS THAN (2),
PARTITION p1 VALUES LESS THAN (20), PARTITION p1 VALUES LESS THAN (20),
PARTITION p2 VALUES LESS THAN (100), PARTITION p2 VALUES LESS THAN (100),
PARTITION p3 VALUES LESS THAN MAXVALUE ) */; PARTITION p3 VALUES LESS THAN MAXVALUE);
SET DEBUG_SYNC= 'alter_table_before_open_tables SIGNAL removing_partitions WAIT_FOR waiting_for_alter'; SET DEBUG_SYNC= 'alter_table_before_open_tables SIGNAL removing_partitions WAIT_FOR waiting_for_alter';
SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done'; SET DEBUG_SYNC= 'alter_table_before_rename_result_table WAIT_FOR delete_done';
--send ALTER TABLE t2 REMOVE PARTITIONING --send ALTER TABLE t2 REMOVE PARTITIONING
connection default; connection default;
--echo # Con default --echo # Con default
SET SESSION debug_dbug= "+d,sleep_before_no_locks_delete_table";
SET DEBUG_SYNC= 'now WAIT_FOR removing_partitions'; SET DEBUG_SYNC= 'now WAIT_FOR removing_partitions';
SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table SIGNAL waiting_for_alter'; SET DEBUG_SYNC= 'rm_table_no_locks_before_delete_table SIGNAL waiting_for_alter';
SET DEBUG_SYNC= 'rm_table_no_locks_before_binlog SIGNAL delete_done'; SET DEBUG_SYNC= 'rm_table_no_locks_before_binlog SIGNAL delete_done';
DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t2;
SET SESSION debug_dbug= "-d,sleep_before_no_locks_delete_table";
--echo # Con 1 --echo # Con 1
connection con1; connection con1;
--error ER_NO_SUCH_TABLE --error ER_NO_SUCH_TABLE

2
sql/sql_table.cc
View File

@ -2278,8 +2278,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
} }
} }
DEBUG_SYNC(thd, "rm_table_no_locks_before_delete_table"); DEBUG_SYNC(thd, "rm_table_no_locks_before_delete_table");
DBUG_EXECUTE_IF("sleep_before_no_locks_delete_table",
my_sleep(100000););
error= 0; error= 0;
if (drop_temporary || if (drop_temporary ||
((access(path, F_OK) && ((access(path, F_OK) &&