diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-02 19:58:08 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-02 19:58:08 +0300 |
| commit | 3719b87396063fadf9a88a6acc6584f1321a7d6a (patch) | |
| tree | c1066773b871f44ebb365c32dab0432f7da6da94 /sql/sql_yacc.yy | |
| parent | fa7b17e904a73da0e938eac8e8d1503838d78202 (diff) | |
| parent | ddee00a6edc735b3bbef42b7d0d662091debd560 (diff) | |
| download | mariadb-git-3719b87396063fadf9a88a6acc6584f1321a7d6a.tar.gz | |
merge
configure.in:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 23bfd5422f9..2318a6d309e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -129,6 +129,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); %token KILL_SYM %token LOAD %token LOCK_SYM +%token LOCKS_SYM %token UNLOCK_SYM %token BINLOG_SYM %token EVENTS_SYM @@ -2855,6 +2856,7 @@ keyword: | LAST_SYM {} | LEVEL_SYM {} | LOCAL_SYM {} + | LOCKS_SYM {} | LOGS_SYM {} | MAX_ROWS {} | MASTER_SYM {} |