diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 10:47:52 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 12:19:59 +0200 |
commit | d2f1c3ed6ccf823babf311970dfa0b7c57850db7 (patch) | |
tree | 7c3db13f204c0a0c08f48ddaa402e64a2e209192 /sql/sql_insert.cc | |
parent | 212994f704496d01881f377e34e04bd007e5e298 (diff) | |
parent | af143474d8925cdbcfc0795a2bc274cbeaad8889 (diff) | |
download | mariadb-git-d2f1c3ed6ccf823babf311970dfa0b7c57850db7.tar.gz |
Merge branch '10.5' into bb-10.6-release
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 14a83442829..1f394a5fded 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -4445,7 +4445,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)) |