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

Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2

Browse Source 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
This commit is contained in:
acurtis@pcgem.rdg.cyberkinetica.com
2005-03-16 16:27:07 +00:00
parent 9d0b81880c 1a64fe066d
commit 4e0b462612
4 changed files with 213 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@ -5850,6 +5850,7 @@ TABLE_LIST *st_select_lex::end_nested_join(THD *thd)
{
TABLE_LIST *ptr;
DBUG_ENTER("end_nested_join");
DBUG_ASSERT(embedding);
ptr= embedding;
join_list= ptr->join_list;
embedding= ptr->embedding;
@ -5863,6 +5864,12 @@ TABLE_LIST *st_select_lex::end_nested_join(THD *thd)
join_list->push_front(embedded);
ptr= embedded;
}
else
if (nested_join->join_list.elements == 0)
{
join_list->pop();
DBUG_RETURN(0);
}
DBUG_RETURN(ptr);
}