database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0

Browse Source 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
This commit is contained in:
igor@rurik.mysql.com
2006-04-21 00:36:20 -07:00
parent 4cbad914ca fd3e924164
commit 37ac782206
8 changed files with 146 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_union.cc
View File

@ -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_sl->next_select());
is_union= test(first_select->next_select() || fake_select_lex);
/* Global option */