From 8f2f1597500c4cf74d5d73a4ee04b54f440df695 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Mar 2002 14:03:42 +0200 Subject: Fix for bug in WHERE key='j' or key='J' Docs/manual.texi: Changelog myisam/myisampack.c: Delete tmp file on error. mysql-test/r/range.result: Updated test case mysql-test/t/range.test: Updated test case --- sql/item_func.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sql/item_func.cc') diff --git a/sql/item_func.cc b/sql/item_func.cc index e7e8964b07a..9f94a25cbf9 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) @@ -2135,7 +2135,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; @@ -2146,7 +2146,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; -- cgit v1.2.1