summaryrefslogtreecommitdiff
path: root/sql/item_create.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-03-26 19:09:47 +0100
committerSergei Golubchik <sergii@pisem.net>2013-03-26 19:09:47 +0100
commite308d7417bc4ceb1b3b72cac2642015b88f310ff (patch)
tree2b840dabe2a4581c45e9ec7e14669b2b5558a42a /sql/item_create.cc
parent045c498691f77ac8e0d8c8b9b705325b3425c69d (diff)
parent48be80cd95c9121d2730ebcd1df2a1a37fe73f3d (diff)
downloadmariadb-git-e308d7417bc4ceb1b3b72cac2642015b88f310ff.tar.gz
5.2 merge
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r--sql/item_create.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 70b9b1754f3..7b1fa917c5c 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -4269,8 +4269,7 @@ Create_func_make_set::create_native(THD *thd, LEX_STRING name,
return NULL;
}
- Item *param_1= item_list->pop();
- return new (thd->mem_root) Item_func_make_set(param_1, *item_list);
+ return new (thd->mem_root) Item_func_make_set(*item_list);
}