diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-05-16 10:52:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-05-16 10:52:08 +0400 |
| commit | bf8ae812690a8c20ea17cb5dc24a57be239a8901 (patch) | |
| tree | e0abd2ff1a154a5b710c9116b35c19b87abf3af3 /sql/sql_base.cc | |
| parent | 3f12a5968a56cb5030381a78b313fdb36024c7f9 (diff) | |
| parent | 3df297271a02ef13babae6ff6a7e47a6bdb7d538 (diff) | |
| download | mariadb-git-bf8ae812690a8c20ea17cb5dc24a57be239a8901.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Also, adding 10.2 related changes for MDEV-22579
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 45916220896..765c743aba2 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8042,10 +8042,8 @@ fill_record(THD *thd, TABLE *table_arg, List<Item> &fields, List<Item> &values, if (table->next_number_field && rfield->field_index == table->next_number_field->field_index) table->auto_increment_field_not_null= TRUE; - Item::Type type= value->type(); if (rfield->vcol_info && - type != Item::DEFAULT_VALUE_ITEM && - type != Item::NULL_ITEM && + !value->vcol_assignment_allowed_value() && table->s->table_category != TABLE_CATEGORY_TEMPORARY) { push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, @@ -8289,18 +8287,14 @@ fill_record(THD *thd, TABLE *table, Field **ptr, List<Item> &values, value=v++; if (field->field_index == autoinc_index) table->auto_increment_field_not_null= TRUE; - if (field->vcol_info) + if (field->vcol_info && + !value->vcol_assignment_allowed_value() && + table->s->table_category != TABLE_CATEGORY_TEMPORARY) { - Item::Type type= value->type(); - if (type != Item::DEFAULT_VALUE_ITEM && - type != Item::NULL_ITEM && - table->s->table_category != TABLE_CATEGORY_TEMPORARY) - { - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, - ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN, - ER_THD(thd, ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN), - field->field_name, table->s->table_name.str); - } + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, + ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN, + ER_THD(thd, ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN), + field->field_name, table->s->table_name.str); } if (use_value) |