diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-13 20:21:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-13 20:21:57 +0100 |
| commit | 12253abadb1b2993469dbfad59b1043ecc974983 (patch) | |
| tree | 1100c6b12f8a6b3773556e70aa1e4c7c4da4ec70 /sql/sql_union.cc | |
| parent | 4b57720caabb434c055bb67b6cf73e51cb044138 (diff) | |
| download | mariadb-git-12253abadb1b2993469dbfad59b1043ecc974983.tar.gz | |
MDEV-714 LP:1020645 - crash (sig 11) with union query
Don't ignore the error from st_select_lex_unit::optimize()
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 5ca4af8eb0d..f9fecae38c4 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -629,7 +629,8 @@ bool st_select_lex_unit::exec() if (!(uncacheable & ~UNCACHEABLE_EXPLAIN) && item) item->make_const(); - saved_error= optimize(); + if ((saved_error= optimize())) + DBUG_RETURN(saved_error); if (uncacheable || !item || !item->assigned() || describe) { |