diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-04-16 09:26:24 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-04-16 09:26:24 +0300 |
| commit | 70a2f3c268eb74e369cf6a76486386aa588844f2 (patch) | |
| tree | 05ac15e525c8f5121280ca7d097bbc66800ea92d /sql/lex.h | |
| parent | 7690ab2fb99ff3fb1b1e7b7d0ab775d2af439d2c (diff) | |
| parent | e5c62e32800a53910dfc96e97e80b2c965030e23 (diff) | |
| download | mariadb-git-70a2f3c268eb74e369cf6a76486386aa588844f2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index 9311f2c3ecd..b5a81a30991 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -209,7 +209,7 @@ static SYMBOL symbols[] = { { "INT4", SYM(INT_SYM),0,0}, { "INT8", SYM(BIGINT),0,0}, { "INTO", SYM(INTO),0,0}, - { "IO_THREAD", SYM(IO_THREAD),0,0}, + { "IO_THREAD", SYM(RELAY_THREAD),0,0}, { "IF", SYM(IF),0,0}, { "IS", SYM(IS),0,0}, { "ISOLATION", SYM(ISOLATION),0,0}, @@ -313,6 +313,7 @@ static SYMBOL symbols[] = { { "REFERENCES", SYM(REFERENCES),0,0}, { "RELAY_LOG_FILE", SYM(RELAY_LOG_FILE_SYM),0,0}, { "RELAY_LOG_POS", SYM(RELAY_LOG_POS_SYM),0,0}, + { "RELAY_THREAD", SYM(RELAY_THREAD),0,0}, { "RELOAD", SYM(RELOAD),0,0}, { "REGEXP", SYM(REGEXP),0,0}, { "RENAME", SYM(RENAME),0,0}, |