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

MDEV-10679 Crash in performance schema and partitioning with discovery

Crash happened because in discover, table->work_part_info was not properly
reset before execution.
Fixed by resetting before calling execute alter table, create table or
mysql_create_frm_image.
This commit is contained in:
Monty
2018-05-25 11:51:43 +03:00
parent 199517f501
commit d8da920264
6 changed files with 33 additions and 6 deletions

View File

@ -6057,6 +6057,7 @@ remove_key:
}
}
DBUG_ASSERT(thd->work_part_info == 0);
#ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *tab_part_info= table->part_info;
thd->work_part_info= thd->lex->part_info;
@ -8411,6 +8412,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
{
DBUG_ENTER("mysql_alter_table");
thd->work_part_info= 0; // Used by partitioning
/*
Check if we attempt to alter mysql.slow_log or
mysql.general_log table and return an error if