diff options
| author | unknown <serg@serg.mysql.com> | 2000-10-11 14:21:04 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-10-11 14:21:04 +0200 |
| commit | 31f27fe347771938109db2131ac914611e3dfff8 (patch) | |
| tree | e2f5974ad6664e224c0d7c3fd628a5936cba5c53 /sql/sql_yacc.yy | |
| parent | 8e004590161d5add0ed22856982afd0edd684e3c (diff) | |
| parent | 5762523b788142675931977656f54860bae67bc6 (diff) | |
| download | mariadb-git-31f27fe347771938109db2131ac914611e3dfff8.tar.gz | |
Merge
Docs/manual.texi:
merged
sql/sql_yacc.yy:
nerged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ae1296153e5..4713ff57a26 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -407,6 +407,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token SQL_WARNINGS %token SQL_AUTO_IS_NULL %token SQL_SAFE_UPDATES +%token SQL_QUOTE_SHOW_CREATE %left SET_VAR %left OR_OR_CONCAT OR @@ -530,7 +531,7 @@ query: verb_clause: alter | analyze - | backup + | backup | begin | change | check @@ -549,7 +550,7 @@ verb_clause: | rename | repair | replace - | restore + | restore | revoke | rollback | select @@ -2101,7 +2102,7 @@ opt_low_priority: /* Delete rows from a table */ delete: - DELETE_SYM + DELETE_SYM { Lex->sql_command= SQLCOM_DELETE; Lex->options=0; Lex->lock_option= current_thd->update_lock_default; } opt_delete_options FROM table @@ -2625,6 +2626,7 @@ set_option: | SQL_AUTO_IS_NULL { $$= OPTION_AUTO_IS_NULL; } | SQL_SAFE_UPDATES { $$= OPTION_SAFE_UPDATES; } | SQL_BUFFER_RESULT { $$= OPTION_BUFFER_RESULT; } + | SQL_QUOTE_SHOW_CREATE { $$= OPTION_QUOTE_SHOW_CREATE; } /* Lock function */ |