diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-02-15 20:31:24 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-02-15 20:31:58 +0100 |
| commit | 28f18aa7a6bb0da125f0ba3cb9da3720fa620501 (patch) | |
| tree | 1b26e15e88c898170859d724b8afbe4b2a63f09b /sql/field.cc | |
| parent | a44f2c3ee88783a0f7fa535124a91a013860b021 (diff) | |
| parent | 62c0ac2da66f8e26d5bbf79f3a7dac56cad34f5e (diff) | |
| download | mariadb-git-bb-10.4-mdev16188.tar.gz | |
Merge branch '10.4' into bb-10.4-mdev16188bb-10.4-mdev16188
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 89b04c4d795..5289798cebf 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -10501,6 +10501,13 @@ bool Column_definition::fix_attributes_temporal_with_time(uint int_part_length) } +bool Column_definition::validate_check_constraint(THD *thd) +{ + return check_constraint && + check_expression(check_constraint, &field_name, VCOL_CHECK_FIELD); +} + + bool Column_definition::check(THD *thd) { DBUG_ENTER("Column_definition::check"); @@ -10515,9 +10522,8 @@ bool Column_definition::check(THD *thd) DBUG_RETURN(TRUE); } - if (check_constraint && - check_expression(check_constraint, &field_name, VCOL_CHECK_FIELD)) - DBUG_RETURN(1); + if (type_handler()->Column_definition_validate_check_constraint(thd, this)) + DBUG_RETURN(TRUE); if (default_value) { |