← 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-22 19:14:43 UTC
  • mto: This revision was merged to the branch mainline in revision 1135.
  • Revision ID: brian@gaz-20090922191443-7be09sny97b41at7
Remove legacy enum

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
2536
2536
          {
2537
2537
            LEX *lex= Lex;
2538
2538
            lex->sql_command= SQLCOM_SELECT;
2539
 
            lex->statement= new(std::nothrow) statement::Select(SQLCOM_SELECT,
2540
 
                                                            YYSession);
 
2539
            lex->statement= new(std::nothrow) statement::Select(YYSession);
2541
2540
            if (lex->statement == NULL)
2542
2541
              DRIZZLE_YYABORT;
2543
2542
          }
4759
4758
             LEX *lex= Lex;
4760
4759
             lex->sql_command= SQLCOM_SHOW_DATABASES;
4761
4760
             lex->statement=
4762
 
               new(std::nothrow) statement::Select(SQLCOM_SHOW_DATABASES, 
4763
 
                                                 YYSession);
 
4761
               new(std::nothrow) statement::Select(YYSession);
4764
4762
             if (lex->statement == NULL)
4765
4763
               DRIZZLE_YYABORT;
4766
4764
             if (prepare_schema_table(YYSession, lex, 0, "SCHEMATA"))
4771
4769
             LEX *lex= Lex;
4772
4770
             lex->sql_command= SQLCOM_SHOW_TABLES;
4773
4771
             lex->statement=
4774
 
               new(std::nothrow) statement::Select(SQLCOM_SHOW_TABLES,
4775
 
                                                 YYSession);
 
4772
               new(std::nothrow) statement::Select(YYSession);
4776
4773
             if (lex->statement == NULL)
4777
4774
               DRIZZLE_YYABORT;
4778
4775
             lex->select_lex.db= $3;
4784
4781
             LEX *lex= Lex;
4785
4782
             lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
4786
4783
             lex->statement=
4787
 
               new(std::nothrow) statement::Select(SQLCOM_SHOW_TABLE_STATUS,
4788
 
                                                 YYSession);
 
4784
               new(std::nothrow) statement::Select(YYSession);
4789
4785
             if (lex->statement == NULL)
4790
4786
               DRIZZLE_YYABORT;
4791
4787
             lex->select_lex.db= $3;
4797
4793
            LEX *lex= Lex;
4798
4794
            lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
4799
4795
            lex->statement=
4800
 
              new(std::nothrow) statement::Select(SQLCOM_SHOW_OPEN_TABLES,
4801
 
                                                YYSession);
 
4796
              new(std::nothrow) statement::Select(YYSession);
4802
4797
            if (lex->statement == NULL)
4803
4798
              DRIZZLE_YYABORT;
4804
4799
            lex->select_lex.db= $3;
4819
4814
            LEX *lex= Lex;
4820
4815
            lex->sql_command= SQLCOM_SHOW_FIELDS;
4821
4816
            lex->statement=
4822
 
              new(std::nothrow) statement::Select(SQLCOM_SHOW_FIELDS, YYSession);
 
4817
              new(std::nothrow) statement::Select(YYSession);
4823
4818
            if (lex->statement == NULL)
4824
4819
              DRIZZLE_YYABORT;
4825
4820
            if ($5)
4831
4826
          {
4832
4827
            LEX *lex= Lex;
4833
4828
            lex->sql_command= SQLCOM_SHOW_KEYS;
4834
 
            lex->statement= new(std::nothrow) statement::Select(SQLCOM_SHOW_KEYS,
4835
 
                                                            YYSession);
 
4829
            lex->statement= new(std::nothrow) statement::Select(YYSession);
4836
4830
            if (lex->statement == NULL)
4837
4831
              DRIZZLE_YYABORT;
4838
4832
            if ($4)
4844
4838
          { 
4845
4839
            (void) create_select_for_variable("warning_count"); 
4846
4840
            LEX *lex= Lex;
4847
 
            lex->statement= new(std::nothrow) statement::Select(SQLCOM_SELECT,
4848
 
                                                            YYSession);
 
4841
            lex->statement= new(std::nothrow) statement::Select(YYSession);
4849
4842
            if (lex->statement == NULL)
4850
4843
              DRIZZLE_YYABORT;
4851
4844
          }
4853
4846
          { 
4854
4847
            (void) create_select_for_variable("error_count"); 
4855
4848
            LEX *lex= Lex;
4856
 
            lex->statement= new(std::nothrow) statement::Select(SQLCOM_SELECT,
4857
 
                                                            YYSession);
 
4849
            lex->statement= new(std::nothrow) statement::Select(YYSession);
4858
4850
            if (lex->statement == NULL)
4859
4851
              DRIZZLE_YYABORT;
4860
4852
          }
4898
4890
            LEX *lex= Lex;
4899
4891
            lex->sql_command= SQLCOM_SHOW_VARIABLES;
4900
4892
            lex->statement=
4901
 
              new(std::nothrow) statement::Select(SQLCOM_SHOW_VARIABLES, 
4902
 
                                                YYSession);
 
4893
              new(std::nothrow) statement::Select(YYSession);
4903
4894
            if (lex->statement == NULL)
4904
4895
              DRIZZLE_YYABORT;
4905
4896
            lex->option_type= $1;
4968
4959
            mysql_init_select(lex);
4969
4960
            lex->current_select->parsing_place= SELECT_LIST;
4970
4961
            lex->sql_command= SQLCOM_SHOW_FIELDS;
4971
 
            lex->statement= new(std::nothrow) statement::Select(SQLCOM_SHOW_FIELDS,
4972
 
                                                            YYSession);
 
4962
            lex->statement= new(std::nothrow) statement::Select(YYSession);
4973
4963
            if (lex->statement == NULL)
4974
4964
              DRIZZLE_YYABORT;
4975
4965
            lex->select_lex.db= 0;