diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-03-02 00:05:30 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-03-02 00:05:30 +0100 |
| commit | 4bce198ce9404c1d3bbdf5376ffc97a882013da6 (patch) | |
| tree | 041762ea34724c707a92c0ca7a74ff324fe8d3f0 /sql | |
| parent | d34ded9790cd9071198850b37cf5476a3b1d9050 (diff) | |
| download | mariadb-git-4bce198ce9404c1d3bbdf5376ffc97a882013da6.tar.gz | |
manual merge fix of bug#42438 in mysql-next-mr-merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_base.cc | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 254b4ce7dd3..63b6a168590 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -4377,6 +4377,8 @@ open_tables_acquire_upgradable_mdl(THD *thd, TABLE_LIST *tables_start, MDL_request_list mdl_requests; TABLE_LIST *table; + DEBUG_SYNC(thd, "open_tables_acquire_upgradable_mdl"); + for (table= tables_start; table && table != tables_end; table= table->next_global) { diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 969f8bdf789..3c6b4760fd3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1897,18 +1897,15 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, mysql_ha_rm_tables(thd, tables); /* Disable drop of enabled log tables, must be done before name locking */ - mysql_mutex_lock(&LOCK_open); for (table= tables; table; table= table->next_local) { if (check_if_log_table(table->db_length, table->db, table->table_name_length, table->table_name, 1)) { - mysql_mutex_unlock(&LOCK_open); my_error(ER_BAD_LOG_STATEMENT, MYF(0), "DROP"); DBUG_RETURN(1); } } - mysql_mutex_unlock(&LOCK_open); if (!drop_temporary) { @@ -2061,6 +2058,8 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, Is exclusive meta-data lock enough ? */ DEBUG_SYNC(thd, "rm_table_part2_before_delete_table"); + DBUG_EXECUTE_IF("sleep_before_part2_delete_table", + my_sleep(100000);); mysql_mutex_lock(&LOCK_open); if (drop_temporary || ((access(path, F_OK) && @@ -7128,6 +7127,8 @@ view_err: create_info->data_file_name=create_info->index_file_name=0; 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. With create_info->frm_only == 1 this creates a .frm file only. |