diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-26 15:26:06 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-26 15:26:06 +0200 |
| commit | 4519b42e61ba2cac248a2238f63113a739661590 (patch) | |
| tree | 802c88ad7cdc5cda175e90802dbfee07f18f3e86 /sql/sql_insert.cc | |
| parent | f90d9c347fdac35720f874070797559ede066598 (diff) | |
| parent | 29633dc0c0c49f27ad3c9a405f4730fbfef4bbb0 (diff) | |
| download | mariadb-git-4519b42e61ba2cac248a2238f63113a739661590.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index a2c31f5684c..2ddcd45079e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -4474,6 +4474,16 @@ TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items, alter_info->create_list.push_back(cr_field, thd->mem_root); } + /* + Item*::type_handler() always returns pointers to + type_handler_{time2|datetime2|timestamp2} no matter what + the current mysql56_temporal_format says. + Let's convert them according to mysql56_temporal_format. + QQ: This perhaps should eventually be fixed to have Item*::type_handler() + respect mysql56_temporal_format, and remove the upgrade from here. + */ + Create_field::upgrade_data_types(alter_info->create_list); + if (create_info->check_fields(thd, alter_info, create_table->table_name, create_table->db, |