← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2008-06-29 20:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: brian@tangent.org-20080629201028-923bdzz0qcjmd6cm
Cleaned up show status.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_yacc.yy
692
692
%token  MODIFY_SYM
693
693
%token  MOD_SYM                       /* SQL-2003-N */
694
694
%token  MONTH_SYM                     /* SQL-2003-R */
695
 
%token  MUTEX_SYM
696
695
%token  NAMES_SYM                     /* SQL-2003-N */
697
696
%token  NAME_SYM                      /* SQL-2003-N */
698
697
%token  NATIONAL_SYM                  /* SQL-2003-R */
5637
5636
            if (prepare_schema_table(YYTHD, lex, 0, SCH_OPEN_TABLES))
5638
5637
              MYSQL_YYABORT;
5639
5638
          }
5640
 
        | ENGINE_SYM known_storage_engines show_engine_param
5641
 
          { Lex->create_info.db_type= $2; }
5642
 
        | ENGINE_SYM ALL show_engine_param
5643
 
          { Lex->create_info.db_type= NULL; }
 
5639
        | ENGINE_SYM known_storage_engines STATUS_SYM /* This should either go... well it should go */
 
5640
          { 
 
5641
            Lex->create_info.db_type= $2; 
 
5642
            Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS;
 
5643
          }
5644
5644
        | opt_full COLUMNS from_or_in table_ident opt_db wild_and_where
5645
5645
          {
5646
5646
            LEX *lex= Lex;
5735
5735
            Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
5736
5736
          }
5737
5737
 
5738
 
show_engine_param:
5739
 
          STATUS_SYM
5740
 
          { Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS; }
5741
 
        | MUTEX_SYM
5742
 
          { Lex->sql_command= SQLCOM_SHOW_ENGINE_MUTEX; }
5743
 
        | LOGS_SYM
5744
 
          { Lex->sql_command= SQLCOM_SHOW_ENGINE_LOGS; }
5745
 
        ;
5746
 
 
5747
5738
master_or_binary:
5748
5739
          MASTER_SYM
5749
5740
        | BINARY
6758
6749
        | MODIFY_SYM               {}
6759
6750
        | MODE_SYM                 {}
6760
6751
        | MONTH_SYM                {}
6761
 
        | MUTEX_SYM                {}
6762
6752
        | NAME_SYM                 {}
6763
6753
        | NAMES_SYM                {}
6764
6754
        | NATIONAL_SYM             {}