← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Monty Taylor
  • Date: 2009-07-28 23:10:51 UTC
  • mto: (1101.1.7 merge)
  • mto: This revision was merged to the branch mainline in revision 1106.
  • Revision ID: mordred@inaugust.com-20090728231051-b4ipdrd6q109v9lh
Fixed the first set of using namespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
92
92
#include <drizzled/command/show_status.h>
93
93
#include <drizzled/command/default_select.h>
94
94
 
95
 
using namespace drizzled::command;
 
95
using namespace drizzled;
96
96
 
97
97
class Table_ident;
98
98
class Item;
2504
2504
          {
2505
2505
            LEX *lex= Lex;
2506
2506
            lex->sql_command= SQLCOM_SELECT;
2507
 
            lex->command= new DefaultSelect(SQLCOM_SELECT, 
2508
 
                                            YYSession);
 
2507
            lex->command= new command::DefaultSelect(SQLCOM_SELECT, 
 
2508
                                                     YYSession);
2509
2509
            if (lex->command == NULL)
2510
2510
              DRIZZLE_YYABORT;
2511
2511
          }
4768
4768
           {
4769
4769
             LEX *lex= Lex;
4770
4770
             lex->sql_command= SQLCOM_SHOW_DATABASES;
4771
 
             lex->command= new DefaultSelect(SQLCOM_SHOW_DATABASES, 
4772
 
                                             YYSession);
 
4771
             lex->command= new command::DefaultSelect(SQLCOM_SHOW_DATABASES, 
 
4772
                                                      YYSession);
4773
4773
             if (lex->command == NULL)
4774
4774
               DRIZZLE_YYABORT;
4775
4775
             if (prepare_schema_table(YYSession, lex, 0, "SCHEMATA"))
4779
4779
           {
4780
4780
             LEX *lex= Lex;
4781
4781
             lex->sql_command= SQLCOM_SHOW_TABLES;
4782
 
             lex->command= new DefaultSelect(SQLCOM_SHOW_TABLES, 
4783
 
                                             YYSession);
 
4782
             lex->command= new command::DefaultSelect(SQLCOM_SHOW_TABLES, 
 
4783
                                                      YYSession);
4784
4784
             if (lex->command == NULL)
4785
4785
               DRIZZLE_YYABORT;
4786
4786
             lex->select_lex.db= $3;
4791
4791
           {
4792
4792
             LEX *lex= Lex;
4793
4793
             lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
4794
 
             lex->command= new DefaultSelect(SQLCOM_SHOW_TABLE_STATUS,
4795
 
                                             YYSession);
 
4794
             lex->command= new command::DefaultSelect(SQLCOM_SHOW_TABLE_STATUS,
 
4795
                                                      YYSession);
4796
4796
             if (lex->command == NULL)
4797
4797
               DRIZZLE_YYABORT;
4798
4798
             lex->select_lex.db= $3;
4803
4803
          {
4804
4804
            LEX *lex= Lex;
4805
4805
            lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
4806
 
            lex->command= new DefaultSelect(SQLCOM_SHOW_OPEN_TABLES,
4807
 
                                            YYSession);
 
4806
            lex->command= new command::DefaultSelect(SQLCOM_SHOW_OPEN_TABLES,
 
4807
                                                     YYSession);
4808
4808
            if (lex->command == NULL)
4809
4809
              DRIZZLE_YYABORT;
4810
4810
            lex->select_lex.db= $3;
4820
4820
          {
4821
4821
            LEX *lex= Lex;
4822
4822
            lex->sql_command= SQLCOM_SHOW_FIELDS;
4823
 
            lex->command= new DefaultSelect(SQLCOM_SHOW_FIELDS,
4824
 
                                            YYSession);
 
4823
            lex->command= new command::DefaultSelect(SQLCOM_SHOW_FIELDS,
 
4824
                                                     YYSession);
4825
4825
            if (lex->command == NULL)
4826
4826
              DRIZZLE_YYABORT;
4827
4827
            if ($5)
4833
4833
          {
4834
4834
            LEX *lex= Lex;
4835
4835
            lex->sql_command= SQLCOM_SHOW_KEYS;
4836
 
            lex->command= new DefaultSelect(SQLCOM_SHOW_KEYS, 
4837
 
                                            YYSession);
 
4836
            lex->command= new command::DefaultSelect(SQLCOM_SHOW_KEYS, 
 
4837
                                                     YYSession);
4838
4838
            if (lex->command == NULL)
4839
4839
              DRIZZLE_YYABORT;
4840
4840
            if ($4)
4846
4846
          { 
4847
4847
            (void) create_select_for_variable("warning_count"); 
4848
4848
            LEX *lex= Lex;
4849
 
            lex->command= new DefaultSelect(SQLCOM_SELECT, 
4850
 
                                            YYSession);
 
4849
            lex->command= new command::DefaultSelect(SQLCOM_SELECT, 
 
4850
                                                     YYSession);
4851
4851
            if (lex->command == NULL)
4852
4852
              DRIZZLE_YYABORT;
4853
4853
          }
4855
4855
          { 
4856
4856
            (void) create_select_for_variable("error_count"); 
4857
4857
            LEX *lex= Lex;
4858
 
            lex->command= new DefaultSelect(SQLCOM_SELECT, 
4859
 
                                            YYSession);
 
4858
            lex->command= new command::DefaultSelect(SQLCOM_SELECT, 
 
4859
                                                     YYSession);
4860
4860
            if (lex->command == NULL)
4861
4861
              DRIZZLE_YYABORT;
4862
4862
          }
4868
4868
          {
4869
4869
            LEX *lex= Lex;
4870
4870
            lex->sql_command= SQLCOM_SHOW_STATUS;
4871
 
            lex->command= new ShowStatus(SQLCOM_SHOW_STATUS,
4872
 
                                         YYSession,
4873
 
                                         &LOCK_status);
 
4871
            lex->command= new command::ShowStatus(SQLCOM_SHOW_STATUS,
 
4872
                                                  YYSession,
 
4873
                                                  &LOCK_status);
4874
4874
            if (lex->command == NULL)
4875
4875
              DRIZZLE_YYABORT;
4876
4876
            lex->option_type= $1;
4883
4883
          {
4884
4884
            LEX *lex= Lex;
4885
4885
            lex->sql_command= SQLCOM_SHOW_VARIABLES;
4886
 
            lex->command= new DefaultSelect(SQLCOM_SHOW_VARIABLES, 
4887
 
                                            YYSession);
 
4886
            lex->command= new command::DefaultSelect(SQLCOM_SHOW_VARIABLES, 
 
4887
                                                     YYSession);
4888
4888
            if (lex->command == NULL)
4889
4889
              DRIZZLE_YYABORT;
4890
4890
            lex->option_type= $1;