diff options
| author | unknown <brian@zim.(none)> | 2006-05-08 15:34:55 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-05-08 15:34:55 -0700 |
| commit | 3aa2d18ca08e48c320b5583ac188ffc460d76719 (patch) | |
| tree | 770564984102a7b9bec653eb374e7d14febc7a50 /sql/lex.h | |
| parent | 484e89dfb61f8996e9d943415ad3b5c2ed449176 (diff) | |
| parent | 12ede0e0be7cf6b391b487d41b0e3aa4a4cc3563 (diff) | |
| download | mariadb-git-3aa2d18ca08e48c320b5583ac188ffc460d76719.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/dep-5.1
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 555a68dc388..5c7c66484c4 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -133,6 +133,7 @@ static SYMBOL symbols[] = { { "CONSTRAINT", SYM(CONSTRAINT)}, { "CONTAINS", SYM(CONTAINS_SYM)}, { "CONTINUE", SYM(CONTINUE_SYM)}, + { "CONTRIBUTORS", SYM(CONTRIBUTORS_SYM)}, { "CONVERT", SYM(CONVERT_SYM)}, { "CREATE", SYM(CREATE)}, { "CROSS", SYM(CROSS)}, |