diff options
| author | unknown <jimw@mysql.com> | 2005-01-18 13:34:22 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-18 13:34:22 -0800 |
| commit | d2778647ae0679dff623a20419c302bad551e9aa (patch) | |
| tree | 933033305584a1a4ad86e6adb559045da365e0bb /sql | |
| parent | 08ea4df60b4e9546dd989afa29284970345c0ac5 (diff) | |
| parent | b697b6c0e02a8e18e62e083f2b21af8455dc3161 (diff) | |
| download | mariadb-git-d2778647ae0679dff623a20419c302bad551e9aa.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_union.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index f89b234f5b0..027a21db7ac 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -466,11 +466,14 @@ int 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(1); + examined_rows+= thd->examined_row_count; + if (union_result->flush()) + { + thd->lex->current_select= lex_select_save; + DBUG_RETURN(1); + } } } if (res) |