Post-merge fixes

1717dbf8 · sergefp@mysql.com · 3c9594b0 · 1717dbf8
Commit 1717dbf8 authored Jul 31, 2007 by sergefp@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_union.cc sql/sql_union.cc +2 -2

No files found.
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -598,8 +598,8 @@ bool st_select_lex_unit::exec()
        else
        {
          join->examined_rows= 0;
-          join->reinit();
+          saved_error= join->reinit();
-          saved_error= join->exec();
+          join->exec();
        }
      }