diff options
author | unknown <serg@serg.mysql.com> | 2002-03-13 17:27:45 +0000 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2002-03-13 17:27:45 +0000 |
commit | 226169b10b260b360fea6f097ba2e1750f5db0bd (patch) | |
tree | ca18ad4bbcd7658a8f7a2987609354e0f412c004 /sql/lex.h | |
parent | d556096f73320f173611f4551a24289b4877f8e6 (diff) | |
parent | 827133864a306e52cc63797f2b09e6542e1dcfe2 (diff) | |
download | mariadb-git-226169b10b260b360fea6f097ba2e1750f5db0bd.tar.gz |
merged
sql/ha_myisam.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
-rw-r--r-- | sql/lex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 46b9e9f4bec..10c1ad766d5 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -191,6 +191,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}, { "IF", SYM(IF),0,0}, { "IS", SYM(IS),0,0}, { "ISOLATION", SYM(ISOLATION),0,0}, @@ -327,6 +328,7 @@ static SYMBOL symbols[] = { { "SQL_SELECT_LIMIT", SYM(SQL_SELECT_LIMIT),0,0}, { "SQL_SLAVE_SKIP_COUNTER", SYM(SQL_SLAVE_SKIP_COUNTER),0,0}, { "SQL_SMALL_RESULT", SYM(SQL_SMALL_RESULT),0,0}, + { "SQL_THREAD", SYM(SQL_THREAD),0,0}, { "SQL_WARNINGS", SYM(SQL_WARNINGS),0,0}, { "SSL", SYM(SSL_SYM),0,0}, { "STRAIGHT_JOIN", SYM(STRAIGHT_JOIN),0,0}, |