diff options
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 80 |
1 files changed, 48 insertions, 32 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3372cfb3341..20c51360d51 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -928,7 +928,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); union_opt select_derived_init option_type2 %type <ulong_num> - ulong_num raid_types merge_insert_types opt_profile_query_arg + ulong_num raid_types merge_insert_types %type <ulonglong_number> ulonglong_num @@ -6678,36 +6678,52 @@ profile_defs: profile_def: CPU_SYM - { Lex->profile_options|= PROFILE_CPU; } + { + Lex->profile_options|= PROFILE_CPU; + } | MEMORY_SYM - { Lex->profile_options|= PROFILE_MEMORY; } + { + Lex->profile_options|= PROFILE_MEMORY; + } | BLOCK_SYM IO_SYM - { Lex->profile_options|= PROFILE_BLOCK_IO; } + { + Lex->profile_options|= PROFILE_BLOCK_IO; + } | CONTEXT_SYM SWITCHES_SYM - { Lex->profile_options|= PROFILE_CONTEXT; } + { + Lex->profile_options|= PROFILE_CONTEXT; + } | PAGE_SYM FAULTS_SYM - { Lex->profile_options|= PROFILE_PAGE_FAULTS; } + { + Lex->profile_options|= PROFILE_PAGE_FAULTS; + } | IPC_SYM - { Lex->profile_options|= PROFILE_IPC; } + { + Lex->profile_options|= PROFILE_IPC; + } | SWAPS_SYM - { Lex->profile_options|= PROFILE_SWAPS; } + { + Lex->profile_options|= PROFILE_SWAPS; + } | SOURCE_SYM - { Lex->profile_options|= PROFILE_SOURCE; } + { + Lex->profile_options|= PROFILE_SOURCE; + } | ALL - { Lex->profile_options|= PROFILE_ALL; } - ; - -opt_profile_query_arg: - /* empty */ - { $$= 0; } - | QUERY_SYM NUM - { $$= atoi($2.str); } + { + Lex->profile_options|= PROFILE_ALL; + } ; opt_profile_args: /* empty */ - | FOR_SYM opt_profile_query_arg - { Lex->profile_query_id = $2; } + { + Lex->profile_query_id= 0; + } + | FOR_SYM QUERY_SYM NUM + { + Lex->profile_query_id= atoi($3.str); + } ; /* Show things */ @@ -7940,7 +7956,7 @@ keyword_sp: | BERKELEY_DB_SYM {} | BINLOG_SYM {} | BIT_SYM {} - | BLOCK_SYM {} + | BLOCK_SYM {} | BOOL_SYM {} | BOOLEAN_SYM {} | BTREE_SYM {} @@ -7957,8 +7973,8 @@ keyword_sp: | COMPRESSED_SYM {} | CONCURRENT {} | CONSISTENT_SYM {} - | CONTEXT_SYM {} - | CPU_SYM {} + | CONTEXT_SYM {} + | CPU_SYM {} | CUBE_SYM {} | DATA_SYM {} | DATETIME {} @@ -7981,7 +7997,7 @@ keyword_sp: | EXPANSION_SYM {} | EXTENDED_SYM {} | FAST_SYM {} - | FAULTS_SYM {} + | FAULTS_SYM {} | FOUND_SYM {} | DISABLE_SYM {} | ENABLE_SYM {} @@ -8006,8 +8022,8 @@ keyword_sp: | ISSUER_SYM {} | INNOBASE_SYM {} | INSERT_METHOD {} - | IO_SYM {} - | IPC_SYM {} + | IO_SYM {} + | IPC_SYM {} | RELAY_THREAD {} | LAST_SYM {} | LEAVES {} @@ -8037,7 +8053,7 @@ keyword_sp: | MAX_UPDATES_PER_HOUR {} | MAX_USER_CONNECTIONS_SYM {} | MEDIUM_SYM {} - | MEMORY_SYM {} + | MEMORY_SYM {} | MERGE_SYM {} | MICROSECOND_SYM {} | MIGRATE_SYM {} @@ -8064,7 +8080,7 @@ keyword_sp: | ONE_SHOT_SYM {} | ONE_SYM {} | PACK_KEYS_SYM {} - | PAGE_SYM {} + | PAGE_SYM {} | PARTIAL {} | PASSWORD {} | PHASE_SYM {} @@ -8074,8 +8090,8 @@ keyword_sp: | PRIVILEGES {} | PROCESS {} | PROCESSLIST_SYM {} - | PROFILE_SYM {} - | PROFILES_SYM {} + | PROFILE_SYM {} + | PROFILES_SYM {} | QUARTER_SYM {} | QUERY_SYM {} | QUICK {} @@ -8109,7 +8125,7 @@ keyword_sp: | SHUTDOWN {} | SNAPSHOT_SYM {} | SOUNDS_SYM {} - | SOURCE_SYM {} + | SOURCE_SYM {} | SQL_CACHE_SYM {} | SQL_BUFFER_RESULT {} | SQL_NO_CACHE_SYM {} @@ -8121,8 +8137,8 @@ keyword_sp: | SUBJECT_SYM {} | SUPER_SYM {} | SUSPEND_SYM {} - | SWAPS_SYM {} - | SWITCHES_SYM {} + | SWAPS_SYM {} + | SWITCHES_SYM {} | TABLES {} | TABLESPACE {} | TEMPORARY {} |