1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

manual merge

This commit is contained in:
serg@serg.mylan
2004-07-20 15:34:57 +02:00
48 changed files with 416 additions and 186 deletions

View File

@ -1833,9 +1833,13 @@ void select_create::abort()
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
enum db_type table_type=table->db_type;
if (!table->tmp_table)
{
hash_delete(&open_cache,(byte*) table);
if (!create_info->table_existed)
quick_rm_table(table_type, create_table->db, create_table->real_name);
if (!create_info->table_existed)
quick_rm_table(table_type, create_table->db, create_table->real_name);
}
else if (!create_info->table_existed)
close_temporary_table(thd, create_table->db, create_table->real_name);
table=0;
}
VOID(pthread_mutex_unlock(&LOCK_open));