database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 5.3->5.5

Browse Source
This commit is contained in:
unknown
2013-10-29 18:50:36 +02:00
parent 86901216fd 5ce11d8b4c
commit 52dea41052
20 changed files with 112 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_derived.cc
View File

@ -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)
{