diff options
author | unknown <hf@genie.(none)> | 2003-03-21 11:06:15 +0400 |
---|---|---|
committer | unknown <hf@genie.(none)> | 2003-03-21 11:06:15 +0400 |
commit | 4809dc7419bbaa03658b3340e61b3f15eeec4d10 (patch) | |
tree | 6735f25527fa9c459972db22fa6488ea01be348a /sql/lex.h | |
parent | d7bccdbe817be53d38cba08648998ad24626aa9b (diff) | |
parent | 1639db0883db893745746418c001a834223966e4 (diff) | |
download | mariadb-git-4809dc7419bbaa03658b3340e61b3f15eeec4d10.tar.gz |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1.lck
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
Diffstat (limited to 'sql/lex.h')
-rw-r--r-- | sql/lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 9156a2d35bb..3bc5820ee66 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -512,6 +512,7 @@ static SYMBOL sql_functions[] = { { "ISEMPTY", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_isempty)}, { "ISNULL", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_isnull)}, { "IS_FREE_LOCK", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_is_free_lock)}, + { "IS_USED_LOCK", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_is_used_lock)}, { "LAST_INSERT_ID", SYM(LAST_INSERT_ID),0,0}, { "ISSIMPLE", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_issimple)}, { "LCASE", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_lcase)}, |