database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2003-07-19 18:49:04 +03:00
parent 46813d545d bb764d6b5e
commit 1167e170d2
8 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_table.cc
View File

@ -1858,10 +1858,19 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
/* COND_refresh will be signaled in close_thread_tables() */
break;
case DISABLE:
VOID(pthread_mutex_lock(&LOCK_open));
wait_while_table_is_used(thd, table);
VOID(pthread_mutex_unlock(&LOCK_open));
table->file->deactivate_non_unique_index(HA_POS_ERROR);
if (table->db_type == DB_TYPE_MYISAM)
{
VOID(pthread_mutex_lock(&LOCK_open));
wait_while_table_is_used(thd, table);
VOID(pthread_mutex_unlock(&LOCK_open));
table->file->deactivate_non_unique_index(HA_POS_ERROR);
}
else
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_ILLEGAL_HA,
ER(ER_ILLEGAL_HA), table->table_name);
break;
/* COND_refresh will be signaled in close_thread_tables() */
break;
}