diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 22:20:45 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 22:20:45 +0200 |
| commit | 97ecffc8ee11863bfb3075041b85a571eafa494f (patch) | |
| tree | 1943b382cfb10d77c564c1bdb1d02b12adb88668 /sql/sql_derived.cc | |
| parent | 0fdb3bcfdbfa5d7cad28adc1c0f7c0958cdab2e0 (diff) | |
| parent | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff) | |
| download | mariadb-git-97ecffc8ee11863bfb3075041b85a571eafa494f.tar.gz | |
merge 10.0-base -> 10.0
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 86587280d03..712b1606c11 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) { |