~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2009-11-04 19:24:05 UTC
  • mfrom: (1206.1.4 staging)
  • Revision ID: brian@gaz-20091104192405-oe9t25mvcmuma9ai
Merge of Padraig && Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
2341
2341
          {
2342
2342
            LEX *lex= Lex;
2343
2343
            lex->sql_command= SQLCOM_BEGIN;
2344
 
            lex->statement= new(std::nothrow) statement::StartTransaction(YYSession);
 
2344
            lex->statement= new(std::nothrow) statement::StartTransaction(YYSession, (start_transaction_option_t)$3);
2345
2345
            if (lex->statement == NULL)
2346
2346
              DRIZZLE_YYABORT;
2347
 
            lex->start_transaction_opt= $3;
2348
2347
          }
2349
2348
        ;
2350
2349
 
2351
2350
start_transaction_opts:
2352
 
          /*empty*/ { $$ = 0; }
 
2351
          /*empty*/ { $$ = START_TRANS_NO_OPTIONS; }
2353
2352
        | WITH CONSISTENT_SYM SNAPSHOT_SYM
2354
2353
          {
2355
 
            $$= DRIZZLE_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
 
2354
            $$= START_TRANS_OPT_WITH_CONS_SNAPSHOT;
2356
2355
          }
2357
2356
        ;
2358
2357