summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2002-03-26 22:23:51 -0700
committerunknown <sasha@mysql.sashanet.com>2002-03-26 22:23:51 -0700
commitef261914d3fdaaf25f1415b8625cc9ff89f9266a (patch)
treeaddd464870d8ce2dc41b174031430761b68ff23e /sql/lex.h
parent4252578b687e972cb482ab22efca01b8ea484221 (diff)
parent079a551ca735e79f3d7a2ebbecf8be4d4ba7608a (diff)
downloadmariadb-git-ef261914d3fdaaf25f1415b8625cc9ff89f9266a.tar.gz
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0 sql/lex.h: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 10c1ad766d5..8c7beb64b9b 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -280,6 +280,8 @@ static SYMBOL symbols[] = {
{ "READ", SYM(READ_SYM),0,0},
{ "REAL", SYM(REAL),0,0},
{ "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},
{ "RELOAD", SYM(RELOAD),0,0},
{ "REGEXP", SYM(REGEXP),0,0},
{ "RENAME", SYM(RENAME),0,0},