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

aftermerge fix

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-03-28 12:57:59 +03:00
parent e0c2ff9df7
commit b3936e426d
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_derived.cc
View File

@ -154,13 +154,8 @@ static int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
res= mysql_union(thd, lex, derived_result, unit); res= mysql_union(thd, lex, derived_result, unit);
else else
{ {
unit->offset_limit_cnt= first_select->offset_limit; unit->set_limit(first_select->select_limit, first_select->offset_limit,
unit->select_limit_cnt= first_select->select_limit+ first_select);
first_select->offset_limit;
if (unit->select_limit_cnt < first_select->select_limit)
unit->select_limit_cnt= HA_POS_ERROR;
if (unit->select_limit_cnt == HA_POS_ERROR)
first_select->options&= ~OPTION_FOUND_ROWS;
lex->current_select= first_select; lex->current_select= first_select;
res= mysql_select(thd, &first_select->ref_pointer_array, res= mysql_select(thd, &first_select->ref_pointer_array,

6
sql/sql_parse.cc
View File

@ -2580,10 +2580,8 @@ mysql_execute_command(THD *thd)
select_lex->options|= SELECT_NO_UNLOCK; select_lex->options|= SELECT_NO_UNLOCK;
select_result *result; select_result *result;
unit->offset_limit_cnt= select_lex->offset_limit; unit->set_limit(select_lex->select_limit, select_lex->offset_limit,
unit->select_limit_cnt= select_lex->select_limit+select_lex->offset_limit; select_lex);
if (unit->select_limit_cnt < select_lex->select_limit)
unit->select_limit_cnt= HA_POS_ERROR; // No limit
if (find_real_table_in_list(tables->next, tables->db, tables->real_name)) if (find_real_table_in_list(tables->next, tables->db, tables->real_name))
{ {