← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_yacc.yy

  • Committer: Monty Taylor
  • Date: 2008-07-05 11:38:34 UTC
  • mfrom: (60 drizzle)
  • mto: This revision was merged to the branch mainline in revision 62.
  • Revision ID: monty@inaugust.com-20080705113834-23bn0884hk8pqfu9
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_yacc.yy
974
974
        if_exists opt_local opt_table_options table_options
975
975
        table_option opt_if_not_exists opt_no_write_to_binlog
976
976
        opt_temporary all_or_any opt_distinct
977
 
        opt_ignore_leaves union_option
 
977
        union_option
978
978
        start_transaction_opts opt_chain opt_release
979
979
        union_opt select_derived_init option_type2
980
980
        opt_transactional_lock_timeout
1088
1088
%type <NONE>
1089
1089
        query verb_clause create change select drop insert replace insert2
1090
1090
        insert_values update delete truncate rename
1091
 
        show describe load alter optimize keycache preload flush
 
1091
        show describe load alter optimize keycache flush
1092
1092
        reset purge begin commit rollback savepoint release
1093
1093
        slave master_def master_defs master_file_def slave_until_opts
1094
1094
        repair analyze check start checksum
1095
1095
        field_list field_list_item field_spec kill column_def key_def
1096
 
        keycache_list assign_to_keycache preload_list preload_keys
 
1096
        keycache_list assign_to_keycache
1097
1097
        select_item_list select_item values_list no_braces
1098
1098
        opt_limit_clause delete_limit_clause fields opt_values values
1099
1099
        opt_precision opt_ignore opt_column opt_restrict
1193
1193
        | lock
1194
1194
        | optimize
1195
1195
        | keycache
1196
 
        | preload
1197
1196
        | purge
1198
1197
        | release
1199
1198
        | rename
3088
3087
        | DEFAULT  { $$ = default_key_cache_base; }
3089
3088
        ;
3090
3089
 
3091
 
preload:
3092
 
          LOAD INDEX_SYM INTO CACHE_SYM
3093
 
          {
3094
 
            LEX *lex=Lex;
3095
 
            lex->sql_command=SQLCOM_PRELOAD_KEYS;
3096
 
          }
3097
 
          preload_list
3098
 
          {}
3099
 
        ;
3100
 
 
3101
 
preload_list:
3102
 
          preload_keys
3103
 
        | preload_list ',' preload_keys
3104
 
        ;
3105
 
 
3106
 
preload_keys:
3107
 
          table_ident cache_keys_spec opt_ignore_leaves
3108
 
          {
3109
 
            if (!Select->add_table_to_list(YYTHD, $1, NULL, $3, TL_READ,
3110
 
                                           Select->pop_index_hints()))
3111
 
              MYSQL_YYABORT;
3112
 
          }
3113
 
        ;
3114
 
 
3115
3090
cache_keys_spec:
3116
3091
          {
3117
3092
            Lex->select_lex.alloc_index_hints(YYTHD);
3128
3103
        | key_or_index '(' opt_key_usage_list ')'
3129
3104
        ;
3130
3105
 
3131
 
opt_ignore_leaves:
3132
 
          /* empty */
3133
 
          { $$= 0; }
3134
 
        | IGNORE_SYM LEAVES { $$= TL_OPTION_IGNORE_LEAVES; }
3135
 
        ;
3136
 
 
3137
3106
/*
3138
3107
  Select : retrieve data from table
3139
3108
*/