database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-02 14:47:37 +03:00
Code Activity

Partial backporting of 7b50447aa6

Browse Source 
(MDEV-9407, MDEV-9408) from 10.1

Needed to fix MDEV-10317 easier.
This commit is contained in:
Alexander Barkov
2016-07-03 11:20:46 +04:00
parent f832b47833
commit 3ccf8218bc
11 changed files with 87 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_insert.cc
View File

@ -3927,8 +3927,8 @@ void select_insert::abort_result_set() {
Field *Item::create_field_for_create_select(TABLE *table)
{
Field *def_field, *tmp_field;
return create_tmp_field(table->in_use, table, this, type(),
(Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0);
return ::create_tmp_field(table->in_use, table, this, type(),
(Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0);
}