diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-25 16:04:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-25 16:04:35 +0100 |
| commit | 0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (patch) | |
| tree | 5c67457ff8abbb89b203a7f55cda776b738c385b /sql/sql_union.cc | |
| parent | 6324c36bd703a0f55dcd49dd721af262f73cf7aa (diff) | |
| parent | ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (diff) | |
| download | mariadb-git-0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2.tar.gz | |
5.5 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 448e3c88d17..6cfdd9ebee8 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()) |