mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Automatic merge with 5.5

Browse source
This commit is contained in:
Michael Widenius 2012-10-05 00:00:21 +03:00
commit 00433b1b04
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_subselect.cc
View file

@ -220,7 +220,7 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref)
uint8 uncacheable;
bool res;
status_var_increment(thd->status_var.feature_subquery);
status_var_increment(thd_param->status_var.feature_subquery);
DBUG_ASSERT(fixed == 0);
engine->set_thd((thd= thd_param));