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

Merge 5.5 -> 5.5-mwl248.

Browse Source
This commit is contained in:
Igor Babaev
2012-04-11 20:44:52 -07:00
parent 1c0a89afcc 85a025f30c
commit 9e74665a2d
580 changed files with 14314 additions and 4274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_admin.cc
View File

@ -443,12 +443,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
my_error(ER_PARTITION_MGMT_ON_NONPARTITIONED, MYF(0));
DBUG_RETURN(TRUE);
}
uint num_parts_found;
uint num_parts_opt= alter_info->partition_names.elements;
num_parts_found= set_part_state(alter_info, table->table->part_info,
PART_ADMIN);
if (num_parts_found != num_parts_opt &&
(!(alter_info->flags & ALTER_ALL_PARTITION)))
if (set_part_state(alter_info, table->table->part_info, PART_ADMIN))
{
char buff[FN_REFLEN + MYSQL_ERRMSG_SIZE];
size_t length;
@ -910,6 +905,9 @@ send_result_message:
DBUG_RETURN(FALSE);
err:
/* Make sure this table instance is not reused after the failure. */
if (table && table->table)
table->table->m_needs_reopen= true;
trans_rollback_stmt(thd);
trans_rollback(thd);
close_thread_tables(thd); // Shouldn't be needed