diff options
author | kostja@oak.local <> | 2003-07-31 17:11:52 +0400 |
---|---|---|
committer | kostja@oak.local <> | 2003-07-31 17:11:52 +0400 |
commit | 50d3291aee85411eee59e410429206bef1afb15b (patch) | |
tree | a08ffe6a07c8efcc13a357c5478274972fd673b0 /sql/item_create.h | |
parent | e8d52f342d907f44bb779b227f895e728482eae9 (diff) | |
parent | ce691c7c61392a75313a129a83800c93b3f13f01 (diff) | |
download | mariadb-git-50d3291aee85411eee59e410429206bef1afb15b.tar.gz |
manual merge
Diffstat (limited to 'sql/item_create.h')
-rw-r--r-- | sql/item_create.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_create.h b/sql/item_create.h index 1326077b096..020ceb30cfa 100644 --- a/sql/item_create.h +++ b/sql/item_create.h @@ -69,14 +69,12 @@ Item *create_func_monthname(Item* a); Item *create_func_nullif(Item* a, Item *b); Item *create_func_oct(Item *); Item *create_func_ord(Item* a); -Item *create_func_old_password(Item* a); Item *create_func_period_add(Item* a, Item *b); Item *create_func_period_diff(Item* a, Item *b); Item *create_func_pi(void); Item *create_func_pow(Item* a, Item *b); Item *create_func_current_user(void); Item *create_func_quarter(Item* a); -Item *create_func_password(Item* a); Item *create_func_radians(Item *a); Item *create_func_release_lock(Item* a); Item *create_func_repeat(Item* a, Item *b); |