diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-07-03 11:20:46 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-07-03 11:20:46 +0400 |
| commit | 3ccf8218bc03a9cc598cd2da5c5a98ea2412cc05 (patch) | |
| tree | e8bc6f5b4600582e87466c22bb7da52fe5cb72dc /sql/sql_insert.cc | |
| parent | f832b47833bd03fbb9e972508097f3f88c0ba184 (diff) | |
| download | mariadb-git-3ccf8218bc03a9cc598cd2da5c5a98ea2412cc05.tar.gz | |
Partial backporting of 7b50447aa6d051b8d14bb01ef14802cb8ffee223
(MDEV-9407, MDEV-9408) from 10.1
Needed to fix MDEV-10317 easier.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 3efdd2535c2..b97bae6b23c 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -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); } |