diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-10-25 15:08:15 +0300 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-10-26 16:46:55 +0300 |
commit | 5569ac00590ba139bbc575c20de4c682919721e5 (patch) | |
tree | 5764ba69c790b296d2a14ade423317e3e647cd62 /sql | |
parent | 59a7bc35fc6526568e49f1087c022c5d01da088a (diff) | |
download | mariadb-git-5569ac00590ba139bbc575c20de4c682919721e5.tar.gz |
MDEV-11126: Crash while altering persistent virtual column
Problem was that if old virtual column is computed and stored there
was no check if new column is really virtual column.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_table.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 050a3383612..5d4c551d730 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6274,6 +6274,7 @@ static bool fill_alter_inplace_info(THD *thd, (field->stored_in_db || field->vcol_info->is_in_partitioning_expr())) { if (is_equal == IS_EQUAL_NO || + !new_field->vcol_info || !field->vcol_info->is_equal(new_field->vcol_info)) ha_alter_info->handler_flags|= Alter_inplace_info::ALTER_COLUMN_VCOL; else |