summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <bell@laptop.sanja.is.com.ua>2003-08-20 17:35:12 +0300
committerunknown <bell@laptop.sanja.is.com.ua>2003-08-20 17:35:12 +0300
commit5e00fc02b91b789b630dc61722cd50ac8abd32cc (patch)
treeae1a08abada36c655dfdf7505487c1f3319aef7f /sql/sql_union.cc
parent6d0a048701e07e69dea899fc1a6caa8f5d6b435d (diff)
downloadmariadb-git-5e00fc02b91b789b630dc61722cd50ac8abd32cc.tar.gz
after merge changing
uninitialized value fixed sql/item_cmpfunc.cc: fixed uninitialized used_tables_cache othyer caches moved on proper place sql/item_subselect.cc: fixed reported table bit sql/mysql_priv.h: after merge chenges. sql/sql_parse.cc: used same new operator for all allocation in subroutine sql/sql_union.cc: fake st_select_lex should have item list for ref_array allocation sql/sql_yacc.yy: after merge changing
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 2a657e9d20d..5e9a50d038e 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -349,6 +349,11 @@ int st_select_lex_unit::exec()
mysql_select automatic allocation)
*/
fake_select_lex->join= new JOIN(thd, item_list, thd->options, result);
+ /*
+ Fake st_select_lex should have item list for correctref_array
+ allocation.
+ */
+ fake_select_lex->item_list= item_list;
}
else
{