diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-14 12:42:06 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-08-14 12:42:06 +0300 |
| commit | b34c8645cdb301140327528a76a79a9e68c25611 (patch) | |
| tree | cb49384a1f2715f859ecea334f20bf4a46ecbcce /sql/sql_base.cc | |
| parent | 7772c7cd945cf674b212b82f4d156099c67344a2 (diff) | |
| parent | 65d48b4a7bd7a57a27f2e9ca54473e1ae86223b5 (diff) | |
| download | mariadb-git-b-10.3-10.3-merge.tar.gz | |
Merge 10.3 into 10.4b-10.3-10.3-merge
Conflicts:
mysql-test/suite/galera/disabled.def (resolved)
mysql-test/suite/galera/r/MW-328A.result (run tests)
mysql-test/suite/innodb/r/alter_copy.result (needs check)
mysql-test/suite/innodb/t/trx_id_future.test (needs check)
sql/opt_range.cc (needs check)
sql/share/errmsg-utf8.txt (needs check)
sql/sql_parse.cc (needs check)
sql/sql_select.cc (needs check)
sql/sql_table.cc (need check)
sql/wsrep_mysqld.cc (resolved)
sql/wsrep_sst.cc (resolved)
sql/wsrep_thd.cc (resolved)
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 881f2662345..4cf9b152940 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2608,6 +2608,7 @@ unlink_all_closed_tables(THD *thd, MYSQL_LOCK *lock, size_t reopen_count) DBUG_ASSERT(thd->open_tables == m_reopen_array[reopen_count]); thd->open_tables->pos_in_locked_tables->table= NULL; + thd->open_tables->pos_in_locked_tables= NULL; close_thread_table(thd, &thd->open_tables); } @@ -8463,8 +8464,8 @@ fill_record(THD *thd, TABLE *table_arg, List<Item> &fields, List<Item> &values, rfield->field_index == table->next_number_field->field_index) table->auto_increment_field_not_null= TRUE; Item::Type type= value->type(); - bool vers_sys_field= table->versioned() && rfield->vers_sys_field(); - if ((rfield->vcol_info || vers_sys_field) && + const bool skip_sys_field= rfield->vers_sys_field(); // TODO: && !thd->vers_modify_history() [MDEV-16546] + if ((rfield->vcol_info || skip_sys_field) && type != Item::DEFAULT_VALUE_ITEM && type != Item::NULL_ITEM && table->s->table_category != TABLE_CATEGORY_TEMPORARY) @@ -8473,15 +8474,14 @@ fill_record(THD *thd, TABLE *table_arg, List<Item> &fields, List<Item> &values, ER_WARNING_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN, ER_THD(thd, ER_WARNING_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN), rfield->field_name.str, table->s->table_name.str); - if (vers_sys_field) - continue; } if (only_unvers_fields && !rfield->vers_update_unversioned()) only_unvers_fields= false; if (rfield->stored_in_db()) { - if (unlikely(value->save_in_field(rfield, 0) < 0) && !ignore_errors) + if (!skip_sys_field && + unlikely(value->save_in_field(rfield, 0) < 0) && !ignore_errors) { my_message(ER_UNKNOWN_ERROR, ER_THD(thd, ER_UNKNOWN_ERROR), MYF(0)); goto err; |