diff options
| author | kostja@oak.local <> | 2003-07-09 18:24:43 +0400 |
|---|---|---|
| committer | kostja@oak.local <> | 2003-07-09 18:24:43 +0400 |
| commit | 941a8623cafac7904e07a50793b41f4131586a5d (patch) | |
| tree | 9774a7006312380fb4dbc92767fe0c009a485b12 /sql/item_create.h | |
| parent | 39e7db9f51fb9f78d7c3846ad11afd1f13778593 (diff) | |
| parent | 0f28677af605bafbb0bcc431a9d467f1d1457d72 (diff) | |
| download | mariadb-git-941a8623cafac7904e07a50793b41f4131586a5d.tar.gz | |
resolved conflict with pulled changeset
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 32e452c15dd..434a0b134c1 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); |