← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Mark Atwood
  • Date: 2011-11-11 18:23:18 UTC
  • mfrom: (2456.1.5 rf)
  • Revision ID: me@mark.atwood.name-20111111182318-skgcp9ce65fd2goa
merge lp:~olafvdspek/drizzle/refactor11

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
3704
3704
            /* for normal joins, $3 != NULL and end_nested_join() != NULL,
3705
3705
               for derived tables, both must equal NULL */
3706
3706
 
3707
 
            if (!($$= $1->end_nested_join(Lex.session)) && $3)
 
3707
            if (!($$= $1->end_nested_join()) && $3)
3708
3708
              DRIZZLE_YYABORT;
3709
3709
 
3710
3710
            if (!$3 && $$)
3745
3745
          {
3746
3746
            Select_Lex *sel= Lex.current_select;
3747
3747
            TableList *embedding;
3748
 
            if (!sel->embedding || sel->end_nested_join(Lex.session))
 
3748
            if (!sel->embedding || sel->end_nested_join())
3749
3749
            {
3750
3750
              /* we are not in parentheses */
3751
3751
              parser::my_parse_error(YYSession->m_lip);