summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 5e4ac02819d..ff43cc435d0 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -10507,8 +10507,8 @@ bool check_expression(Virtual_column_info *vcol, const LEX_CSTRING *name,
uint filter= VCOL_IMPOSSIBLE;
if (type != VCOL_GENERATED_VIRTUAL && type != VCOL_DEFAULT)
filter|= VCOL_NOT_STRICTLY_DETERMINISTIC;
- if (type == VCOL_GENERATED_VIRTUAL)
- filter|= VCOL_NOT_VIRTUAL;
+ if (type != VCOL_DEFAULT)
+ filter|= VCOL_NEXTVAL;
if (unlikely(ret || (res.errors & filter)))
{
@@ -10844,6 +10844,7 @@ Column_definition::Column_definition(THD *thd, Field *old_field,
Field *orig_field)
:Column_definition_attributes(old_field)
{
+ srid= 0;
on_update= NULL;
field_name= old_field->field_name;
flags= old_field->flags;