database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Mattias Jonsson
2010-11-15 16:32:21 +01:00
parent 0e1c167e16 f3e2b3df18
commit 59849b2bc8
3 changed files with 159 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_partition.cc
View File

@@ -5934,6 +5934,12 @@ static void alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt)
int err;
if (lpt->thd->locked_tables)
{
/*
Close the table if open, to remove/destroy the already altered
table->part_info object, so that it is not reused.
*/
if (lpt->table->db_stat)
abort_and_upgrade_lock_and_close_table(lpt);
/*
When we have the table locked, it is necessary to reopen the table
since all table objects were closed and removed as part of the
@@ -6436,7 +6442,20 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
table, table_list, FALSE, NULL,
written_bin_log));
err:
close_thread_tables(thd);
if (thd->locked_tables)
{
/*
table->part_info was altered in prep_alter_part_table and must be
destroyed and recreated, since otherwise it will be reused, since
we are under LOCK TABLE.
*/
alter_partition_lock_handling(lpt);
}
else
{
/* Force the table to be closed to avoid reuse of the table->part_info */
close_thread_tables(thd);
}
DBUG_RETURN(TRUE);
}
#endif