diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /sql/item_create.cc | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 7bddc29b812..6cb45f05efc 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -1837,7 +1837,7 @@ protected: class Create_func_sha2 : public Create_func_arg2 { public: - virtual Item* create(THD *thd, Item *arg1, Item *arg2); + virtual Item* create_2_arg(THD *thd, Item *arg1, Item *arg2); static Create_func_sha2 s_singleton; @@ -2074,7 +2074,7 @@ protected: class Create_func_to_seconds : public Create_func_arg1 { public: - virtual Item* create(THD *thd, Item *arg1); + virtual Item* create_1_arg(THD *thd, Item *arg1); static Create_func_to_seconds s_singleton; @@ -4382,7 +4382,7 @@ Create_func_sha::create_1_arg(THD *thd, Item *arg1) Create_func_sha2 Create_func_sha2::s_singleton; Item* -Create_func_sha2::create(THD *thd, Item *arg1, Item *arg2) +Create_func_sha2::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_sha2(arg1, arg2); } @@ -4570,7 +4570,7 @@ Create_func_to_days::create_1_arg(THD *thd, Item *arg1) Create_func_to_seconds Create_func_to_seconds::s_singleton; Item* -Create_func_to_seconds::create(THD *thd, Item *arg1) +Create_func_to_seconds::create_1_arg(THD *thd, Item *arg1) { return new (thd->mem_root) Item_func_to_seconds(arg1); } |