diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 15:28:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 15:28:07 +0100 |
| commit | 0dc23679c867629ded5f9534d2ab6e8edf238aa0 (patch) | |
| tree | 9cf966507fa2ef0fd17932b600d051df5f7bd2e5 /sql/sql_union.cc | |
| parent | 6efa5efa7dd112b6ac2efdd84235a13cca51c4d4 (diff) | |
| parent | 0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (diff) | |
| download | mariadb-git-0dc23679c867629ded5f9534d2ab6e8edf238aa0.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index e49a8abc95a..9d068e464f5 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -647,6 +647,9 @@ bool st_select_lex_unit::exec() if (!saved_error && !was_executed) save_union_explain(thd->lex->explain); + if (saved_error) + DBUG_RETURN(saved_error); + if (uncacheable || !item || !item->assigned() || describe) { for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select()) |