diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
| commit | a736a3174a4e7c0d92a38901ae61f563d4afede7 (patch) | |
| tree | 348d15f7c9cc883e86d852fbddc780f506669ee4 /sql/sql_table.cc | |
| parent | b44e12fef176bfc0884fb2c5f4ba7f42bf054f44 (diff) | |
| parent | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (diff) | |
| download | mariadb-git-a736a3174a4e7c0d92a38901ae61f563d4afede7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index dbe5ac15172..12e09e7bcb2 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -8280,7 +8280,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table, def= new (thd->mem_root) Create_field(thd, field, field); def->invisible= INVISIBLE_SYSTEM; alter_info->flags|= ALTER_CHANGE_COLUMN; - if (field->flags & VERS_SYS_START_FLAG) + if (field->flags & VERS_ROW_START) create_info->vers_info.as_row.start= def->field_name= Vers_parse_info::default_start; else create_info->vers_info.as_row.end= def->field_name= Vers_parse_info::default_end; @@ -8321,9 +8321,9 @@ mysql_prepare_alter_table(THD *thd, TABLE *table, !vers_system_invisible) { StringBuffer<NAME_LEN*3> tmp; - if (!(dropped_sys_vers_fields & VERS_SYS_START_FLAG)) + if (!(dropped_sys_vers_fields & VERS_ROW_START)) append_drop_column(thd, &tmp, table->vers_start_field()); - if (!(dropped_sys_vers_fields & VERS_SYS_END_FLAG)) + if (!(dropped_sys_vers_fields & VERS_ROW_END)) append_drop_column(thd, &tmp, table->vers_end_field()); my_error(ER_MISSING, MYF(0), table->s->table_name.str, tmp.c_ptr()); goto err; |