diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2018-06-22 16:26:43 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2019-09-11 19:36:09 +0300 |
| commit | 8e3a1c576ef26afea79a7b5d782564c96f3722ef (patch) | |
| tree | cc61a628def4450adedcb8b6e89edf5f63ff3a9c /sql/sql_insert.cc | |
| parent | 5c5452a5a086a9584efb2255059da671fff6e484 (diff) | |
| download | mariadb-git-10.4-nikita-merge.tar.gz | |
cherry-pick MDEV-1649010.4-nikita-merge
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 8404d777334..89c43938e8a 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -4202,7 +4202,7 @@ TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items, if (!opt_explicit_defaults_for_timestamp) promote_first_timestamp_column(&alter_info->create_list); - if (create_info->fix_create_fields(thd, alter_info, *create_table, true)) + if (create_info->fix_create_fields(thd, alter_info, *create_table)) DBUG_RETURN(NULL); while ((item=it++)) @@ -4241,7 +4241,8 @@ TABLE *select_create::create_table_from_items(THD *thd, List<Item> *items, alter_info->create_list.push_back(cr_field, thd->mem_root); } - if (create_info->check_fields(thd, alter_info, *create_table)) + if (create_info->check_fields(thd, alter_info, *create_table, + select_field_count)) DBUG_RETURN(NULL); DEBUG_SYNC(thd,"create_table_select_before_create"); |