diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-30 14:35:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-30 14:35:34 +0300 |
| commit | 682e7b8ff48f9fca3219814fb0f06e09d5a7d346 (patch) | |
| tree | 37f8d15bd5c550897040922f67e89e0cb1271507 /storage/innobase/include/row0merge.h | |
| parent | c0f977105820dcc9daadf268181561dca9de4483 (diff) | |
| download | mariadb-git-682e7b8ff48f9fca3219814fb0f06e09d5a7d346.tar.gz | |
MDEV-16334 Incorrect ALTER TABLE for changing column option
commit 2dbeebdb16436e3c2723cd483aaf21d93de799d6 accidentally changed
ALTER_COLUMN_OPTION and ALTER_COLUMN_STORAGE_TYPE to be separate flags.
InnoDB and Mroonga are only checking for the latter;
the example storage engine is checking for the former only.
The impact of this bug should be incorrect operation of Mroonga when
the column options GROONGA_TYPE, FLAGS are changed.
InnoDB does not define any column options, only table options,
so the flag ALTER_COLUMN_OPTION should never have been set.
Also, remove the unused flag ALTER_DROP_HISTORICAL.
Diffstat (limited to 'storage/innobase/include/row0merge.h')
| -rw-r--r-- | storage/innobase/include/row0merge.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/include/row0merge.h b/storage/innobase/include/row0merge.h index f808da1863e..7330031c186 100644 --- a/storage/innobase/include/row0merge.h +++ b/storage/innobase/include/row0merge.h @@ -322,7 +322,6 @@ this function and it will be passed to other functions for further accounting. @param[in] add_v new virtual columns added along with indexes @param[in] eval_table mysql table used to evaluate virtual column value, see innobase_get_computed_value(). -@param[in] drop_historical whether to drop historical system rows @return DB_SUCCESS or error code */ dberr_t row_merge_build_indexes( @@ -341,8 +340,7 @@ row_merge_build_indexes( bool skip_pk_sort, ut_stage_alter_t* stage, const dict_add_v_col_t* add_v, - struct TABLE* eval_table, - bool drop_historical) + struct TABLE* eval_table) MY_ATTRIBUTE((warn_unused_result)); /********************************************************************//** |