diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-26 16:33:12 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-26 16:33:12 +0200 |
| commit | ffac54885d9661895e7e5138d7ddb65664b5df4e (patch) | |
| tree | 8bb7255430e0a6311f40d0188850c72b34cc1a7a /sql/sql_yacc.yy | |
| parent | bf1f1ea8d813057c786dbc7caa163ce75fd675e9 (diff) | |
| parent | ca78b386d6991efa3a5281d6b2b1fa692bf3a847 (diff) | |
| download | mariadb-git-ffac54885d9661895e7e5138d7ddb65664b5df4e.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1-amerge
into chilla.local:/home/mydev/mysql-5.1-ateam
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3fa536b99ae..0d2e89e4b5a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9317,7 +9317,6 @@ user: keyword: keyword_sp {} | ASCII_SYM {} - | AUTHORS_SYM {} | BACKUP_SYM {} | BEGIN_SYM {} | BYTE_SYM {} @@ -9375,6 +9374,7 @@ keyword_sp: | ALGORITHM_SYM {} | ANY_SYM {} | AT_SYM {} + | AUTHORS_SYM {} | AUTO_INC {} | AUTOEXTEND_SIZE_SYM {} | AVG_ROW_LENGTH {} @@ -9400,6 +9400,7 @@ keyword_sp: | COMPRESSED_SYM {} | CONCURRENT {} | CONSISTENT_SYM {} + | CONTRIBUTORS_SYM {} | CUBE_SYM {} | DATA_SYM {} | DATAFILE_SYM {} |