summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-02-27 20:30:08 +0100
committerunknown <serg@serg.mylan>2004-02-27 20:30:08 +0100
commit1e191736d6ddf9dc70d6f430921588fdb6aecf91 (patch)
treed0f8d063fcdfa4d4c0549be6ee8d1a3d49393175 /sql/lex.h
parentbda3122232ef76d8ff9a2737666e84dfba756923 (diff)
downloadmariadb-git-1e191736d6ddf9dc70d6f430921588fdb6aecf91.tar.gz
my_gethwaddr() for linux/freebsd
UUID() function BitKeeper/etc/ignore: Added mysys/test_gethwaddr to the ignore list include/my_sys.h: my_gethwaddr() mysys/Makefile.am: my_gethwaddr sql/item_create.cc: UUID() function sql/item_create.h: UUID() function sql/item_strfunc.cc: UUID() function sql/item_strfunc.h: UUID() function sql/lex.h: UUID() function sql/mysql_priv.h: UUID() function sql/mysqld.cc: UUID() function sql/sql_class.cc: cleanup
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 029a8ac4218..9cdb1067d91 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -654,7 +654,7 @@ static SYMBOL sql_functions[] = {
{ "STDDEV", SYM(STD_SYM)},
{ "STR_TO_DATE", F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_str_to_date)},
{ "STRCMP", F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_strcmp)},
- { "SUBSTR", SYM(SUBSTRING)},
+ { "SUBSTR", SYM(SUBSTRING)},
{ "SUBSTRING", SYM(SUBSTRING)},
{ "SUBSTRING_INDEX", SYM(SUBSTRING_INDEX)},
{ "SUBTIME", F_SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_subtime)},
@@ -674,6 +674,7 @@ static SYMBOL sql_functions[] = {
{ "UNIQUE_USERS", SYM(UNIQUE_USERS)},
{ "UNIX_TIMESTAMP", SYM(UNIX_TIMESTAMP)},
{ "UPPER", F_SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)},
+ { "UUID", F_SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_uuid)},
{ "VARIANCE", SYM(VARIANCE_SYM)},
{ "VERSION", F_SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_version)},
{ "WEEK", SYM(WEEK_SYM)},