diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-24 20:56:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-24 20:56:49 +0200 |
| commit | 31a1934c9cc0c4781b4a8c30f60252b02a873a2a (patch) | |
| tree | 2fcb4a28f64b1affafbd5e0d25b085a32b6c7227 /sql/sql_yacc.yy | |
| parent | e8ab897fcab3018641935c9923fb7b0be4594f2c (diff) | |
| download | mariadb-git-31a1934c9cc0c4781b4a8c30f60252b02a873a2a.tar.gz | |
MDEV-4660 SHUTDOWN command
Based on James Briggs contribution.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8e22950aa72..1a12a11eae7 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -789,10 +789,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); %pure_parser /* We have threads */ /* - Currently there are 174 shift/reduce conflicts. + Currently there are 196 shift/reduce conflicts. We should not introduce new conflicts any more. */ -%expect 174 +%expect 196 /* Comments for TOKENS. @@ -1816,6 +1816,7 @@ statement: | set | signal_stmt | show + | shutdown | slave | start | truncate @@ -12217,6 +12218,11 @@ kill_expr: } ; + +shutdown: + SHUTDOWN { Lex->sql_command= SQLCOM_SHUTDOWN; } + ; + /* change database */ use: |