summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2003-06-12 06:22:35 -0700
committerunknown <igor@rurik.mysql.com>2003-06-12 06:22:35 -0700
commit3dc5ecc968ac84ac522cc0c8d5f146c2c13b2a42 (patch)
tree148b8c692128d7dcdb3d773ae94f069f283fce24 /sql/lex.h
parent0d04bbc528b9c77311ecdad34c5316e446021725 (diff)
parent2e60382abe7ade34b1ab8ea0e970147394d4424a (diff)
downloadmariadb-git-3dc5ecc968ac84ac522cc0c8d5f146c2c13b2a42.tar.gz
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 include/my_base.h: Auto merged include/my_sys.h: Auto merged myisam/myisamdef.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/lex.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.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 064bab8acbb..0c3e58c4a50 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -221,6 +221,7 @@ static SYMBOL symbols[] = {
{ "KILL", SYM(KILL_SYM),0,0},
{ "LAST", SYM(LAST_SYM),0,0},
{ "LEADING", SYM(LEADING),0,0},
+ { "LEAVES", SYM(LEAVES),0,0},
{ "LEFT", SYM(LEFT),0,0},
{ "LEVEL", SYM(LEVEL_SYM),0,0},
{ "LIKE", SYM(LIKE),0,0},
@@ -299,6 +300,7 @@ static SYMBOL symbols[] = {
{ "POLYGON", SYM(POLYGON),0,0},
{ "PURGE", SYM(PURGE),0,0},
{ "PRECISION", SYM(PRECISION),0,0},
+ { "PRELOAD", SYM(PRELOAD),0,0},
{ "PREV", SYM(PREV_SYM),0,0},
{ "PRIMARY", SYM(PRIMARY_SYM),0,0},
{ "PROCEDURE", SYM(PROCEDURE),0,0},