mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user