diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
| commit | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (patch) | |
| tree | 515c69dbce80f1af73974286de8f87413b1cad23 /sql/sql_derived.cc | |
| parent | 86901216fd4f7eb0844e884203810a0e43fcd103 (diff) | |
| parent | 5ce11d8b4ca2a57968656925a69ed8114d5374f6 (diff) | |
| download | mariadb-git-52dea41052bc1be1efbe59c320046d7e62cfd0a6.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index bb55451e9dc..b584ed6de93 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -617,7 +617,8 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived) { sl->context.outer_context= 0; // Prepare underlying views/DT first. - sl->handle_derived(lex, DT_PREPARE); + if ((res= sl->handle_derived(lex, DT_PREPARE))) + goto exit; if (derived->outer_join) { |