diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-08 15:18:29 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-12-08 15:18:29 +0400 |
| commit | 4429ed7ec75c9a91a8171d2be66d0fe81544eb9f (patch) | |
| tree | 7b91366685d8d680ce56a1da4b23547de32a184b /sql/item_create.h | |
| parent | 7f9ba01f9918d43742fc7de6fb4550d34e8f3541 (diff) | |
| parent | 417354eaa127934f5aadcc9b245561a1519ba998 (diff) | |
| download | mariadb-git-4429ed7ec75c9a91a8171d2be66d0fe81544eb9f.tar.gz | |
post-merge fixes
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.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, 0 insertions, 1 deletions
diff --git a/sql/item_create.h b/sql/item_create.h index 083868d87a6..b445eab3bac 100644 --- a/sql/item_create.h +++ b/sql/item_create.h @@ -72,7 +72,6 @@ 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_radians(Item *a); Item *create_func_release_lock(Item* a); Item *create_func_repeat(Item* a, Item *b); |