diff options
| author | unknown <igor@rurik.mysql.com> | 2003-06-19 02:34:33 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-06-19 02:34:33 -0700 |
| commit | 32ddd42736b4399ed1ac5baabfafc91d4f0b84ca (patch) | |
| tree | f087d5382ea1b5ddd9c0b03a6059bb9c71006ec9 /sql/sql_yacc.yy | |
| parent | 4a83fca1d7fcd5155b45350b90f0f220d3379aa6 (diff) | |
| download | mariadb-git-32ddd42736b4399ed1ac5baabfafc91d4f0b84ca.tar.gz | |
preload.result, preload.test:
Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
Syntax change for preload statement
sql/sql_yacc.yy:
Syntax change for preload statement
sql/lex.h:
Syntax change for preload statement
mysql-test/t/preload.test:
Removed non-generic info (key used blocks)
mysql-test/r/preload.result:
Removed non-generic info (key used blocks)
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0b18b7ffdc5..323fa3da6b6 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -310,7 +310,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token DUMPFILE %token PACK_KEYS_SYM %token PARTIAL -%token PRELOAD %token PRIMARY_SYM %token PRIVILEGES %token PROCESS @@ -581,7 +580,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); type int_type real_type order_dir opt_field_spec lock_option udf_type if_exists opt_local opt_table_options table_options table_option opt_if_not_exists opt_no_write_to_binlog opt_var_type opt_var_ident_type - delete_option opt_temporary all_or_any opt_distinct opt_ignore_leafs + delete_option opt_temporary all_or_any opt_distinct opt_ignore_leaves %type <ulong_num> ULONG_NUM raid_types merge_insert_types @@ -1838,7 +1837,7 @@ table_to_table: }; preload: - PRELOAD + LOAD INDEX INTO CACHE_SYM { LEX *lex=Lex; lex->sql_command=SQLCOM_PRELOAD_KEYS; @@ -1852,7 +1851,7 @@ preload_list: | preload_list ',' preload_keys; preload_keys: - table_ident preload_keys_spec opt_ignore_leafs + table_ident preload_keys_spec opt_ignore_leaves { LEX *lex=Lex; SELECT_LEX *sel= &lex->select_lex; @@ -1880,7 +1879,7 @@ preload_key_list_or_empty: | '(' key_usage_list2 ')' {} ; -opt_ignore_leafs: +opt_ignore_leaves: /* empty */ { $$= 0; } | IGNORE_SYM LEAVES { $$= TL_OPTION_IGNORE_LEAVES; } @@ -4374,7 +4373,6 @@ keyword: | PASSWORD {} | POINT_SYM {} | POLYGON {} - | PRELOAD {} | PREV_SYM {} | PROCESS {} | PROCESSLIST_SYM {} |