diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-11-04 12:51:01 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-11-04 12:51:01 +0200 |
| commit | 92c280552fee94ed016a05f5012954f71cd3cd90 (patch) | |
| tree | c454c1dd90b194295647b83c3ce47a4fb03cb98e /sql/sql_union.cc | |
| parent | fab5bf352950e15fbca1befd55eacdd5924dac71 (diff) | |
| download | mariadb-git-92c280552fee94ed016a05f5012954f71cd3cd90.tar.gz | |
fixed problem with UNION flags
sql/sql_lex.h:
removed unused flag
sql/sql_union.cc:
correct flag used
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index de2bb4a786c..93541d66d65 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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, |