From e13d4c95d3011200d666b93858775cddc1e5b1d2 Mon Sep 17 00:00:00 2001 From: Sneha Modi Date: Fri, 11 Nov 2011 14:53:50 +0530 Subject: BUG#11748731 - 37248: SOME 'BIG' TESTS FAILING ON 6.0 : A change has been made in the sql/sql_table.cc file to include debug_sync. --- sql/sql_table.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/sql_table.cc') diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 9a68420e5fc..5363737998b 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -5958,6 +5958,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, case ENABLE: if (wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN)) goto err; + DEBUG_SYNC(thd,"alter_table_enable_indexes"); DBUG_EXECUTE_IF("sleep_alter_enable_indexes", my_sleep(6000000);); error= table->file->ha_enable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE); break; -- cgit v1.2.1 From 7ee2962f192e21c0e30cf030e719e1396f7be1ad Mon Sep 17 00:00:00 2001 From: Sneha Modi Date: Mon, 21 Nov 2011 17:07:08 +0530 Subject: Bug#11748731:SOME 'BIG' TESTS FAILING ON 6.0 A patch for alter_table-big.test has been committed earlier. This is a patch for create-big.test: The test used to time-out after 900 seconds. It relied on debug sleeps that are no longer present in the code. Since the sleeps are long gone, fixing the problem didn't involve just updating the result file or using macro "show_binlog_events2.inc" instead of "show binlog events" statement. The test needed to be rewritten using debug sync points, and result then needed to be updated. So, the sleeps have been replaced by debug_sync points and the test execution time has been reduced significantly. --- sql/sql_table.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sql/sql_table.cc') diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 5363737998b..be1e0d009a3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4555,6 +4555,8 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table, goto err; src_table->table->use_all_columns(); + DEBUG_SYNC(thd, "create_table_like_after_open"); + /* Fill HA_CREATE_INFO and Alter_info with description of source table. */ bzero((char*) &local_create_info, sizeof(local_create_info)); local_create_info.db_type= src_table->table->s->db_type(); @@ -4603,6 +4605,9 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table, thd->mdl_context.is_lock_owner(MDL_key::TABLE, table->db, table->table_name, MDL_EXCLUSIVE)); + + DEBUG_SYNC(thd, "create_table_like_before_binlog"); + /* We have to write the query before we unlock the tables. */ -- cgit v1.2.1