diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-21 21:29:19 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-21 21:29:19 -0800 |
| commit | 746152959a8787f3c7cf6b1c710fc1ee6c54419f (patch) | |
| tree | fc887933e9d5aaf6d9c83d3e36bba237862c6e65 /sql/sql_base.cc | |
| parent | 2255132f200940186c6e9dfcedae6edb85e7cee7 (diff) | |
| parent | 8127e631de90dddc25b3cdffe59e147333eb6c74 (diff) | |
| download | mariadb-git-746152959a8787f3c7cf6b1c710fc1ee6c54419f.tar.gz | |
Merge 5.2->5.3
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 3952ae1ff82..630474fcecc 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -8679,7 +8679,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; |