summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2022-11-02 21:43:42 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2022-11-02 21:43:42 +0100
commit7fef00fdd791fe37590782ac52c8038a88da6c1b (patch)
tree53b532b44abfac271c6f2dab89618b32efb4e402 /sql/sql_insert.cc
parentebf2121529fcf06971b4c0fc28f40654ef8dd99f (diff)
parent63a3dffeb62d7b4b39453ac2a01f992ba2795240 (diff)
downloadmariadb-git-7fef00fdd791fe37590782ac52c8038a88da6c1b.tar.gz
Merge branch '10.8' into 10.9
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r--sql/sql_insert.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index f8702cd19bb..a7fc7afb19f 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -4546,6 +4546,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,