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 ../10.1 into bb-10.1-explain-json

Browse Source
This commit is contained in:
Sergei Petrunia
2014-12-02 00:32:31 +03:00
parent 753718c201 54392f0a22
commit 5c5a8b1cc8
53 changed files with 1370 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@ -7767,6 +7767,9 @@ bool st_select_lex_unit::add_fake_select_lex(THD *thd_arg)
fake_select_lex->context.resolve_in_select_list= TRUE;
fake_select_lex->context.select_lex= fake_select_lex;
fake_select_lex->nest_level_base= first_select()->nest_level_base;
fake_select_lex->nest_level=first_select()->nest_level;
if (!is_union())
{
/*