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

MDEV-14696 Server crashes in in prep_alter_part_table on 2nd execution of PS.

Browse Source 
The thd->lex->part_info should be kept intact during PS
        execution. Or the second execution gets that modified part_info.
        Let's modify ths->work_part_info instead.
This commit is contained in:
Alexey Botchkov
2018-01-30 11:28:21 +04:00
parent c4a908cb56
commit 6b4a4a85a7
4 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@ -5997,6 +5997,7 @@ remove_key_no_warn:
#ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *tab_part_info= table->part_info;
thd->work_part_info= thd->lex->part_info;
if (tab_part_info && thd->lex->check_exists)
{
/* ALTER TABLE ADD PARTITION IF NOT EXISTS */
@ -6015,7 +6016,7 @@ remove_key_no_warn:
ER_SAME_NAME_PARTITION, ER(ER_SAME_NAME_PARTITION),
pe->partition_name);
alter_info->flags&= ~Alter_info::ALTER_ADD_PARTITION;
thd->lex->part_info= NULL;
thd->work_part_info= NULL;
break;
}
}