summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-03-19 22:25:44 +0200
committermonty@narttu.mysql.fi <>2003-03-19 22:25:44 +0200
commitb883a9c01c9caba9e74bdc6f4f5b57b1a81a0fd4 (patch)
treeabbee7d78d1399086c301a5bd02f3ba4a9e1ea38 /sql/lex.h
parent48a9c1239c6b2b2ba27f8a1a9a0df98af204d53b (diff)
parent584729430a77280e753cc4bf67d2bb6d7f94a6b8 (diff)
downloadmariadb-git-b883a9c01c9caba9e74bdc6f4f5b57b1a81a0fd4.tar.gz
Merge with 4.0.12
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 80f84628d27..5b1cbb58c1e 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -257,6 +257,7 @@ static SYMBOL symbols[] = {
{ "MEDIUMINT", SYM(MEDIUMINT),0,0},
{ "MERGE", SYM(MERGE_SYM),0,0},
{ "MEDIUM", SYM(MEDIUM_SYM),0,0},
+ { "MEMORY", SYM(MEMORY_SYM),0,0},
{ "MIDDLEINT", SYM(MEDIUMINT),0,0}, /* For powerbuilder */
{ "MIN_ROWS", SYM(MIN_ROWS),0,0},
{ "MINUTE", SYM(MINUTE_SYM),0,0},