diff options
| author | unknown <paul@kite-hub.kitebird.com> | 2004-06-04 10:35:57 -0500 |
|---|---|---|
| committer | unknown <paul@kite-hub.kitebird.com> | 2004-06-04 10:35:57 -0500 |
| commit | 8438a19382c58da3f74b1d2a044f535d9bfdf9d3 (patch) | |
| tree | f79be13c42e247ff39be0788f890ae0228787a69 /sql/sql_yacc.yy | |
| parent | e6b4b3048142ff0e479c22203227e69ef7b44793 (diff) | |
| parent | 1407f2f0a8cfd50843f7419123a8c64e5dbb516b (diff) | |
| download | mariadb-git-8438a19382c58da3f74b1d2a044f535d9bfdf9d3.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a14fdef5aaa..dc6968bb15a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -316,6 +316,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token NUM %token OFFSET_SYM %token ON +%token ONE_SHOT_SYM %token OPEN_SYM %token OPTION %token OPTIONALLY @@ -5002,6 +5003,7 @@ keyword: | NVARCHAR_SYM {} | OFFSET_SYM {} | OLD_PASSWORD {} + | ONE_SHOT_SYM {} | OPEN_SYM {} | PACK_KEYS_SYM {} | PARTIAL {} @@ -5088,6 +5090,7 @@ set: lex->sql_command= SQLCOM_SET_OPTION; lex->option_type=OPT_SESSION; lex->var_list.empty(); + lex->one_shot_set= 0; } option_value_list {} @@ -5106,6 +5109,7 @@ option_type: | GLOBAL_SYM { Lex->option_type= OPT_GLOBAL; } | LOCAL_SYM { Lex->option_type= OPT_SESSION; } | SESSION_SYM { Lex->option_type= OPT_SESSION; } + | ONE_SHOT_SYM { Lex->option_type= OPT_SESSION; Lex->one_shot_set= 1; } ; opt_var_type: |