database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

fixed problem with UNION flags

Browse Source 
sql/sql_lex.h:
  removed unused flag
sql/sql_union.cc:
  correct flag used
This commit is contained in:
unknown
2003-11-04 12:51:01 +02:00
parent fab5bf3529
commit 92c280552f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_union.cc
View File

@@ -377,11 +377,12 @@ int st_select_lex_unit::exec()
offset_limit_cnt= global_parameters->offset_limit;
select_limit_cnt= global_parameters->select_limit +
global_parameters->offset_limit;
if (select_limit_cnt < global_parameters->select_limit)
select_limit_cnt= HA_POS_ERROR; // no limit
if (select_limit_cnt == HA_POS_ERROR)
options&= ~OPTION_FOUND_ROWS;
else if (found_rows_for_union && !describe)
else if (found_rows_for_union && !thd->lex.describe)
options|= OPTION_FOUND_ROWS;
fake_select_lex->ftfunc_list= &empty_list;
fake_select_lex->table_list.link_in_list((byte *)&result_table_list,