Commit a3ae370d authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

fixed current_thread

parent 25687eae
......@@ -1800,10 +1800,10 @@ expr_expr:
| expr NOT IN_SYM '(' expr_list ')'
{ $$= new Item_func_not(new Item_func_in($1,*$5)); }
| expr IN_SYM in_subselect
{ $$= new Item_in_subselect(current_thd, $1, $3); }
{ $$= new Item_in_subselect(YYTHD, $1, $3); }
| expr NOT IN_SYM in_subselect
{
$$= new Item_func_not(new Item_in_subselect(current_thd, $1, $4));
$$= new Item_func_not(new Item_in_subselect(YYTHD, $1, $4));
}
| expr BETWEEN_SYM no_and_expr AND expr
{ $$= new Item_func_between($1,$3,$5); }
......@@ -1824,7 +1824,7 @@ expr_expr:
| expr comp_op all_or_any in_subselect %prec EQ
{
Item_allany_subselect *it=
new Item_allany_subselect(current_thd, $1, (*$2)($3), $4);
new Item_allany_subselect(YYTHD, $1, (*$2)($3), $4);
if ($3)
$$ = new Item_func_not(it); /* ALL */
else
......@@ -1870,7 +1870,7 @@ no_in_expr:
| no_in_expr comp_op all_or_any in_subselect %prec EQ
{
Item_allany_subselect *it=
new Item_allany_subselect(current_thd, $1, (*$2)($3), $4);
new Item_allany_subselect(YYTHD, $1, (*$2)($3), $4);
if ($3)
$$ = new Item_func_not(it); /* ALL */
else
......@@ -1901,10 +1901,10 @@ no_and_expr:
| no_and_expr NOT IN_SYM '(' expr_list ')'
{ $$= new Item_func_not(new Item_func_in($1,*$5)); }
| no_and_expr IN_SYM in_subselect
{ $$= new Item_in_subselect(current_thd, $1, $3); }
{ $$= new Item_in_subselect(YYTHD, $1, $3); }
| no_and_expr NOT IN_SYM in_subselect
{
$$= new Item_func_not(new Item_in_subselect(current_thd, $1, $4));
$$= new Item_func_not(new Item_in_subselect(YYTHD, $1, $4));
}
| no_and_expr BETWEEN_SYM no_and_expr AND expr
{ $$= new Item_func_between($1,$3,$5); }
......@@ -1924,7 +1924,7 @@ no_and_expr:
| no_and_expr comp_op all_or_any in_subselect %prec EQ
{
Item_allany_subselect *it=
new Item_allany_subselect(current_thd, $1, (*$2)($3), $4);
new Item_allany_subselect(YYTHD, $1, (*$2)($3), $4);
if ($3)
$$ = new Item_func_not(it); /* ALL */
else
......
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