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

after merge fixes

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2005-01-18 23:34:15 +02:00
parent a7c56a858b 477047401c
commit a2e0ecbf03
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_union.cc
View File

@@ -478,11 +478,14 @@ bool st_select_lex_unit::exec()
}
res= sl->join->error;
offset_limit_cnt= sl->offset_limit;
if (!res && union_result->flush())
if (!res)
{
examined_rows+= thd->examined_row_count;
thd->lex->current_select= lex_select_save;
DBUG_RETURN(TRUE);
examined_rows+= thd->examined_row_count;
if (union_result->flush())
{
thd->lex->current_select= lex_select_save;
DBUG_RETURN(1);
}
}
}
if (res)