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/item_create.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/item_create.h')
| -rw-r--r-- | sql/item_create.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_create.h b/sql/item_create.h index 14812c47cdc..0e2295b6d4f 100644 --- a/sql/item_create.h +++ b/sql/item_create.h @@ -100,6 +100,7 @@ Item *create_func_version(void); Item *create_func_weekday(Item* a); Item *create_load_file(Item* a); Item *create_func_is_free_lock(Item* a); +Item *create_func_is_used_lock(Item* a); Item *create_func_quote(Item* a); Item *create_func_geometry_from_text(Item *a); |