← 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-06-30 00:17:07 UTC
  • mfrom: (1079.2.9 info-schema-plugin)
  • Revision ID: brian@gaz-20090630001707-33byyr838fb60u9m
Merge Padraig 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
4759
4759
           {
4760
4760
             LEX *lex= Lex;
4761
4761
             lex->sql_command= SQLCOM_SHOW_DATABASES;
4762
 
             if (prepare_schema_table(YYSession, lex, 0, SCH_SCHEMATA))
 
4762
             if (prepare_schema_table(YYSession, lex, 0, "SCHEMATA"))
4763
4763
               DRIZZLE_YYABORT;
4764
4764
           }
4765
4765
         | opt_full TABLES opt_db show_wild
4767
4767
             LEX *lex= Lex;
4768
4768
             lex->sql_command= SQLCOM_SHOW_TABLES;
4769
4769
             lex->select_lex.db= $3;
4770
 
             if (prepare_schema_table(YYSession, lex, 0, SCH_TABLE_NAMES))
 
4770
             if (prepare_schema_table(YYSession, lex, 0, "TABLE_NAMES"))
4771
4771
               DRIZZLE_YYABORT;
4772
4772
           }
4773
4773
         | TABLE_SYM STATUS_SYM opt_db show_wild
4775
4775
             LEX *lex= Lex;
4776
4776
             lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
4777
4777
             lex->select_lex.db= $3;
4778
 
             if (prepare_schema_table(YYSession, lex, 0, SCH_TABLES))
 
4778
             if (prepare_schema_table(YYSession, lex, 0, "TABLES"))
4779
4779
               DRIZZLE_YYABORT;
4780
4780
           }
4781
4781
        | OPEN_SYM TABLES opt_db show_wild
4783
4783
            LEX *lex= Lex;
4784
4784
            lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
4785
4785
            lex->select_lex.db= $3;
4786
 
            if (prepare_schema_table(YYSession, lex, 0, SCH_OPEN_TABLES))
 
4786
            if (prepare_schema_table(YYSession, lex, 0, "OPEN_TABLES"))
4787
4787
              DRIZZLE_YYABORT;
4788
4788
          }
4789
4789
        | ENGINE_SYM known_storage_engines STATUS_SYM /* This should either go... well it should go */
4797
4797
            lex->sql_command= SQLCOM_SHOW_FIELDS;
4798
4798
            if ($5)
4799
4799
              $4->change_db($5);
4800
 
            if (prepare_schema_table(YYSession, lex, $4, SCH_COLUMNS))
 
4800
            if (prepare_schema_table(YYSession, lex, $4, "COLUMNS"))
4801
4801
              DRIZZLE_YYABORT;
4802
4802
          }
4803
4803
        | keys_or_index from_or_in table_ident opt_db where_clause
4806
4806
            lex->sql_command= SQLCOM_SHOW_KEYS;
4807
4807
            if ($4)
4808
4808
              $3->change_db($4);
4809
 
            if (prepare_schema_table(YYSession, lex, $3, SCH_STATISTICS))
 
4809
            if (prepare_schema_table(YYSession, lex, $3, "STATISTICS"))
4810
4810
              DRIZZLE_YYABORT;
4811
4811
          }
4812
4812
        | COUNT_SYM '(' '*' ')' WARNINGS
4822
4822
            LEX *lex= Lex;
4823
4823
            lex->sql_command= SQLCOM_SHOW_STATUS;
4824
4824
            lex->option_type= $1;
4825
 
            if (prepare_schema_table(YYSession, lex, 0, SCH_STATUS))
 
4825
            if (prepare_schema_table(YYSession, lex, 0, "STATUS"))
4826
4826
              DRIZZLE_YYABORT;
4827
4827
          }
4828
4828
        | opt_full PROCESSLIST_SYM
4832
4832
            LEX *lex= Lex;
4833
4833
            lex->sql_command= SQLCOM_SHOW_VARIABLES;
4834
4834
            lex->option_type= $1;
4835
 
            if (prepare_schema_table(YYSession, lex, 0, SCH_VARIABLES))
 
4835
            if (prepare_schema_table(YYSession, lex, 0, "VARIABLES"))
4836
4836
              DRIZZLE_YYABORT;
4837
4837
          }
4838
4838
        | CREATE DATABASE opt_if_not_exists ident
4892
4892
            lex->sql_command= SQLCOM_SHOW_FIELDS;
4893
4893
            lex->select_lex.db= 0;
4894
4894
            lex->verbose= 0;
4895
 
            if (prepare_schema_table(YYSession, lex, $2, SCH_COLUMNS))
 
4895
            if (prepare_schema_table(YYSession, lex, $2, "COLUMNS"))
4896
4896
              DRIZZLE_YYABORT;
4897
4897
          }
4898
4898
          opt_describe_column {}