← 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: 2009-09-24 06:11:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1135.
  • Revision ID: brian@gaz-20090924061154-y81qqckcbv12dekd
A few more cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
4783
4783
          }
4784
4784
        | ENGINE_SYM known_storage_engines STATUS_SYM /* This should either go... well it should go */
4785
4785
          { 
4786
 
            Lex->show_engine= $2; 
4787
4786
            Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS;
4788
4787
            Lex->statement= 
4789
 
              new(std::nothrow) statement::ShowEngineStatus(YYSession);
 
4788
              new(std::nothrow) statement::ShowEngineStatus(YYSession, $2);
4790
4789
            if (Lex->statement == NULL)
4791
4790
              DRIZZLE_YYABORT;
4792
4791
          }
5903
5902
            lex->statement= new(std::nothrow) statement::StartTransaction(YYSession);
5904
5903
            if (lex->statement == NULL)
5905
5904
              DRIZZLE_YYABORT;
5906
 
            lex->start_transaction_opt= 0;
5907
5905
          }
5908
5906
          opt_work {}
5909
5907
        ;
5937
5935
          {
5938
5936
            LEX *lex=Lex;
5939
5937
            lex->sql_command= SQLCOM_COMMIT;
5940
 
            lex->statement= new(std::nothrow) statement::Commit(YYSession);
 
5938
            statement::Commit *statement= new(std::nothrow) statement::Commit(YYSession);
 
5939
            lex->statement= statement;
5941
5940
            if (lex->statement == NULL)
5942
5941
              DRIZZLE_YYABORT;
5943
 
            lex->tx_chain= $3; 
5944
 
            lex->tx_release= $4;
 
5942
            statement->tx_chain= $3; 
 
5943
            statement->tx_release= $4;
5945
5944
          }
5946
5945
        ;
5947
5946
 
5950
5949
          {
5951
5950
            LEX *lex=Lex;
5952
5951
            lex->sql_command= SQLCOM_ROLLBACK;
5953
 
            lex->statement= new(std::nothrow) statement::Rollback(YYSession);
 
5952
            statement::Rollback *statement= new(std::nothrow) statement::Rollback(YYSession);
 
5953
            lex->statement= statement;
5954
5954
            if (lex->statement == NULL)
5955
5955
              DRIZZLE_YYABORT;
5956
 
            lex->tx_chain= $3; 
5957
 
            lex->tx_release= $4;
 
5956
            statement->tx_chain= $3; 
 
5957
            statement->tx_release= $4;
5958
5958
          }
5959
5959
        | ROLLBACK_SYM opt_work
5960
5960
          TO_SYM opt_savepoint ident