← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2011-01-04 22:27:38 UTC
  • mfrom: (2041.3.16 session-fix)
  • mto: This revision was merged to the branch mainline in revision 2055.
  • Revision ID: brian@tangent.org-20110104222738-4r3hrsxrlbuildrg
Merge in cleanup of error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
2698
2698
        | SQL_BIG_RESULT   { Lex->current_select->options|= SELECT_BIG_RESULT; }
2699
2699
        | SQL_BUFFER_RESULT
2700
2700
          {
2701
 
            if (check_simple_select())
 
2701
            if (check_simple_select(YYSession))
2702
2702
              DRIZZLE_YYABORT;
2703
2703
            Lex->current_select->options|= OPTION_BUFFER_RESULT;
2704
2704
          }
2705
2705
        | SQL_CALC_FOUND_ROWS
2706
2706
          {
2707
 
            if (check_simple_select())
 
2707
            if (check_simple_select(YYSession))
2708
2708
              DRIZZLE_YYABORT;
2709
2709
            Lex->current_select->options|= OPTION_FOUND_ROWS;
2710
2710
          }