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

remove a sleep from the test

Browse Source
This commit is contained in:
Sergei Golubchik 2013-04-16 17:14:26 +02:00
parent 821db3801d
commit 1035a16a73
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@ ENGINE = MYISAM
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 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_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= 'alter_table_before_main_binlog SIGNAL partitioning_removed';
ALTER TABLE t1 REMOVE PARTITIONING; ALTER TABLE t1 REMOVE PARTITIONING;
@ -28,7 +27,6 @@ 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 partitioning_removed';
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
# Con 1 # Con 1
SET SESSION debug_dbug= "-d,sleep_before_create_table_no_lock";
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
# #

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

@ -30,7 +30,6 @@ ENGINE = MYISAM
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 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_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= 'alter_table_before_main_binlog SIGNAL partitioning_removed';
--send ALTER TABLE t1 REMOVE PARTITIONING --send ALTER TABLE t1 REMOVE PARTITIONING
@ -43,7 +42,6 @@ DROP TABLE IF EXISTS t1;
--echo # Con 1 --echo # Con 1
connection con1; connection con1;
--reap --reap
SET SESSION debug_dbug= "-d,sleep_before_create_table_no_lock";
connection default; connection default;
SET DEBUG_SYNC= 'RESET'; SET DEBUG_SYNC= 'RESET';
connection con1; connection con1;

2
sql/sql_table.cc
View File

@ -6985,8 +6985,6 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
create_info->data_file_name=create_info->index_file_name=0; create_info->data_file_name=create_info->index_file_name=0;
DEBUG_SYNC(thd, "alter_table_before_create_table_no_lock"); DEBUG_SYNC(thd, "alter_table_before_create_table_no_lock");
DBUG_EXECUTE_IF("sleep_before_create_table_no_lock",
my_sleep(100000););
/* /*
Create a table with a temporary name. Create a table with a temporary name.
With C_ALTER_TABLE_FRM_ONLY this creates a .frm file only and With C_ALTER_TABLE_FRM_ONLY this creates a .frm file only and