diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-23 15:18:05 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-23 15:18:05 -0800 |
| commit | a3011410f37f1afdbfabef8a8be71d4aa8c723c8 (patch) | |
| tree | 86997a41bbc6c4379209af0cccdb4ae612c8d4f4 /sql/sql_base.cc | |
| parent | d911853189c9fc0971bd13f49d911d726cc25253 (diff) | |
| parent | fa9c70b3dd69dc5fd56484867a547548a71c0eda (diff) | |
| download | mariadb-git-a3011410f37f1afdbfabef8a8be71d4aa8c723c8.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 83ed29064b5..c76f2d43279 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8939,7 +8939,8 @@ fill_record(THD * thd, List<Item> &fields, List<Item> &values, ER(ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN), rfield->field_name, table->s->table_name.str); } - if ((value->save_in_field(rfield, 0) < 0) && !ignore_errors) + if ((!rfield->vcol_info || rfield->stored_in_db) && + (value->save_in_field(rfield, 0)) < 0 && !ignore_errors) { my_message(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR), MYF(0)); goto err; |