summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-03-11 13:26:26 +0200
committerunknown <bell@sanja.is.com.ua>2003-03-11 13:26:26 +0200
commit83814ef4290b939872e3661de85643cae20758a8 (patch)
treee2e90d1ceb948e0f2b9d92481f4afba290e67b46 /sql/item_cmpfunc.cc
parent79a6e9dcda812157a56dc6abddee918ffb4a9755 (diff)
parentbbc8f836c0400f361458bffd42d71ea2177a9e18 (diff)
downloadmariadb-git-83814ef4290b939872e3661de85643cae20758a8.tar.gz
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1 sql/item_cmpfunc.cc: Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index c4197beffbf..301e5b4454f 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -266,8 +266,8 @@ int Arg_comparator::compare_e_row()
uint n= (*a)->cols();
for (uint i= 0; i<n; i++)
{
- if ((res= comparators[i].compare()))
- return 1;
+ if ((res= !comparators[i].compare()))
+ return 0;
}
return 1;
}
@@ -362,7 +362,6 @@ void Item_func_equal::fix_length_and_dec()
{
Item_bool_func2::fix_length_and_dec();
maybe_null=null_value=0;
- set_cmp_func();
}
longlong Item_func_equal::val_int()