diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-08 17:12:32 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-08 17:12:32 +0200 |
| commit | 1d480419822b53c840de54542c1d1a0851dbe2c8 (patch) | |
| tree | 629aabba2d52741b4075c3e345396bd989516cb2 /sql/sql_insert.cc | |
| parent | 3ebbfd88a0360938e3a5a480265beb2a71b1268a (diff) | |
| parent | 4f54c219e7c73072d7eff1e81e0f51dc1ff47509 (diff) | |
| download | mariadb-git-1d480419822b53c840de54542c1d1a0851dbe2c8.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 9b60e072896..0d4eabd2d06 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -4498,7 +4498,7 @@ TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items, tmp_table.maybe_null= 0; tmp_table.in_use= thd; - if (!opt_explicit_defaults_for_timestamp) + if (!(thd->variables.option_bits & OPTION_EXPLICIT_DEF_TIMESTAMP)) promote_first_timestamp_column(&alter_info->create_list); if (create_info->fix_create_fields(thd, alter_info, *create_table)) |