← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
3756
3756
            /* Use $2 instead of Lex->current_select as derived table will
3757
3757
               alter value of Lex->current_select. */
3758
3758
            if (!($3 || $5) && $2->embedding &&
3759
 
                !$2->embedding->nested_join->join_list.elements)
 
3759
                !$2->embedding->getNestedJoin()->join_list.elements)
3760
3760
            {
3761
3761
              /* we have a derived table ($3 == NULL) but no alias,
3762
3762
                 Since we are nested in further parentheses so we
3920
3920
            }
3921
3921
            embedding= Lex->current_select->embedding;
3922
3922
            $$= embedding &&
3923
 
                !embedding->nested_join->join_list.elements;
 
3923
                !embedding->getNestedJoin()->join_list.elements;
3924
3924
            /* return true if we are deeply nested */
3925
3925
          }
3926
3926
        ;
4774
4774
 
4775
4775
             if (session->add_item_to_list(my_field))
4776
4776
               DRIZZLE_YYABORT;
 
4777
 
 
4778
              if (session->add_order_to_list(my_field, true))
 
4779
                DRIZZLE_YYABORT;
4777
4780
           }
4778
4781
         | TABLES opt_db show_wild
4779
4782
           {
4831
4834
 
4832
4835
             if (session->add_item_to_list(my_field))
4833
4836
               DRIZZLE_YYABORT;
 
4837
 
 
4838
              if (session->add_order_to_list(my_field, true))
 
4839
                DRIZZLE_YYABORT;
4834
4840
           }
4835
4841
         | TEMPORARY_SYM TABLES show_wild
4836
4842
           {