Commit 30578852 authored by sergefp@mysql.com's avatar sergefp@mysql.com

Post-merge fixes

parent d7c1be4b
......@@ -575,7 +575,7 @@ Item_allany_subselect::Item_allany_subselect(Item * left_exp,
chooser_compare_func_creator fc,
st_select_lex *select_lex,
bool all_arg)
:Item_in_subselect(), all(all_arg), func_creator(fc)
:Item_in_subselect(), func_creator(fc), all(all_arg)
{
DBUG_ENTER("Item_in_subselect::Item_in_subselect");
left_expr= left_exp;
......
......@@ -523,6 +523,8 @@ class sys_var;
class Comp_creator;
typedef Comp_creator* (*chooser_compare_func_creator)(bool invert);
#include "item.h"
extern my_decimal decimal_zero;
/* sql_parse.cc */
void free_items(Item *item);
void cleanup_items(Item *item);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment