diff options
| author | unknown <serg@serg.mysql.com> | 2002-04-02 14:59:40 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-04-02 14:59:40 +0000 |
| commit | d2771b82a48ae4a0548daffba5961c5b345f019c (patch) | |
| tree | ffe29ba0f45879ed83f8af080165d5ef573d7534 /sql/item_func.cc | |
| parent | 8bf63614de3e2f09559a952f9f2ad9b7af4ef794 (diff) | |
| parent | b344dbc2da2811e6c31274c3aa3b3df56fa0bdf6 (diff) | |
| download | mariadb-git-d2771b82a48ae4a0548daffba5961c5b345f019c.tar.gz | |
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index ec9244e783e..023b79b3ff7 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -148,7 +148,7 @@ void Item_func::print_op(String *str) str->append(')'); } -bool Item_func::eq(const Item *item) const +bool Item_func::eq(const Item *item, bool binary_cmp) const { /* Assume we don't have rtti */ if (this == item) @@ -160,7 +160,7 @@ bool Item_func::eq(const Item *item) const func_name() != item_func->func_name()) return 0; for (uint i=0; i < arg_count ; i++) - if (!args[i]->eq(item_func->args[i])) + if (!args[i]->eq(item_func->args[i], binary_cmp)) return 0; return 1; } @@ -1882,7 +1882,7 @@ void Item_func_get_user_var::print(String *str) str->append(')'); } -bool Item_func_get_user_var::eq(const Item *item) const +bool Item_func_get_user_var::eq(const Item *item, bool binary_cmp) const { /* Assume we don't have rtti */ if (this == item) @@ -2136,7 +2136,7 @@ bool Item_func_match::fix_index() return 1; } -bool Item_func_match::eq(const Item *item) const +bool Item_func_match::eq(const Item *item, bool binary_cmp) const { if (item->type() != FUNC_ITEM) return 0; @@ -2147,7 +2147,7 @@ bool Item_func_match::eq(const Item *item) const Item_func_match *ifm=(Item_func_match*) item; if (key == ifm->key && table == ifm->table && - key_item()->eq(ifm->key_item())) + key_item()->eq(ifm->key_item(), binary_cmp)) return 1; return 0; |