diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /sql/item_create.cc | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
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 d0f1ab54eca..bc3c904e5fd 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -1334,7 +1334,7 @@ protected: class Create_func_like_range_min : 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_like_range_min s_singleton; @@ -1347,7 +1347,7 @@ protected: class Create_func_like_range_max : 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_like_range_max s_singleton; @@ -3868,7 +3868,7 @@ Create_func_length::create_1_arg(THD *thd, Item *arg1) Create_func_like_range_min Create_func_like_range_min::s_singleton; Item* -Create_func_like_range_min::create(THD *thd, Item *arg1, Item *arg2) +Create_func_like_range_min::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_like_range_min(arg1, arg2); } @@ -3877,7 +3877,7 @@ Create_func_like_range_min::create(THD *thd, Item *arg1, Item *arg2) Create_func_like_range_max Create_func_like_range_max::s_singleton; Item* -Create_func_like_range_max::create(THD *thd, Item *arg1, Item *arg2) +Create_func_like_range_max::create_2_arg(THD *thd, Item *arg1, Item *arg2) { return new (thd->mem_root) Item_func_like_range_max(arg1, arg2); } |