summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorunknown <vtkachenko@intelp4d.mysql.com>2004-12-31 09:00:34 +0100
committerunknown <vtkachenko@intelp4d.mysql.com>2004-12-31 09:00:34 +0100
commitc4c2c7bceb3a427fe669bfeec6747a72e404e1ad (patch)
tree2d4a9134c1f6b640fe3644c0690a6d0f81ec14f5 /sql/lex.h
parentee4c910422236fd376df0d9688ce0ca39f61fdfc (diff)
parentaf22d870fae05614d893a0acd620e6bb369cc157 (diff)
downloadmariadb-git-c4c2c7bceb3a427fe669bfeec6747a72e404e1ad.tar.gz
Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0 BitKeeper/etc/logging_ok: auto-union innobase/srv/srv0srv.c: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/ha_innodb.cc: 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_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged
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 5b6c86bf0ed..a1078512b87 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -323,6 +323,7 @@ static SYMBOL symbols[] = {
{ "MULTILINESTRING", SYM(MULTILINESTRING)},
{ "MULTIPOINT", SYM(MULTIPOINT)},
{ "MULTIPOLYGON", SYM(MULTIPOLYGON)},
+ { "MUTEX", SYM(MUTEX_SYM)},
{ "NAME", SYM(NAME_SYM)},
{ "NAMES", SYM(NAMES_SYM)},
{ "NATIONAL", SYM(NATIONAL_SYM)},