summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2006-04-21 08:19:38 -0700
committerigor@rurik.mysql.com <>2006-04-21 08:19:38 -0700
commit639e8750329613363ac4b3c92b55d5e2db992568 (patch)
tree14c80cec6058de5f107603a041b64dfe66d10484 /sql/sql_union.cc
parent37ac7822065195d0bf7061d947306f2481c7191c (diff)
downloadmariadb-git-639e8750329613363ac4b3c92b55d5e2db992568.tar.gz
Post merge fixes
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 68036f76e96..c5af81ae55a 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -202,7 +202,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
thd_arg->lex->current_select= sl= first_sl;
found_rows_for_union= first_sl->options & OPTION_FOUND_ROWS;
- is_union= test(first_select->next_select() || fake_select_lex);
+ is_union= first_sl->next_select() || fake_select_lex;
/* Global option */