database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for bug#4488: sign-aware equality check

Browse Source
This commit is contained in:
sergefp@mysql.com
2004-08-17 02:59:24 +04:00
parent 4ddeee9d2f
commit fdb51f67a2
4 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/range.result
View File

@ -500,6 +500,9 @@ count(*)
select count(*) from t1 where x > -16; select count(*) from t1 where x > -16;
count(*) count(*)
2 2
select count(*) from t1 where x = 18446744073709551601;
count(*)
1
create table t2 (x bigint not null); create table t2 (x bigint not null);
insert into t2(x) values (0xfffffffffffffff0); insert into t2(x) values (0xfffffffffffffff0);
insert into t2(x) values (0xfffffffffffffff1); insert into t2(x) values (0xfffffffffffffff1);
@ -525,6 +528,9 @@ count(*)
select count(*) from t2 where x > -16; select count(*) from t2 where x > -16;
count(*) count(*)
1 1
select count(*) from t2 where x = 18446744073709551601;
count(*)
0
drop table t1; drop table t1;
create table t1 (x bigint unsigned not null primary key) engine=innodb; create table t1 (x bigint unsigned not null primary key) engine=innodb;
insert into t1(x) values (0xfffffffffffffff0); insert into t1(x) values (0xfffffffffffffff0);
@ -551,4 +557,7 @@ count(*)
select count(*) from t1 where x > -16; select count(*) from t1 where x > -16;
count(*) count(*)
1 1
select count(*) from t1 where x = 18446744073709551601;
count(*)
1
drop table t1; drop table t1;

4
mysql-test/t/range.test
View File

@ -396,6 +396,8 @@ select count(*) from t1 where x<0;
select count(*) from t1 where x < -16; select count(*) from t1 where x < -16;
select count(*) from t1 where x = -16; select count(*) from t1 where x = -16;
select count(*) from t1 where x > -16; select count(*) from t1 where x > -16;
select count(*) from t1 where x = 18446744073709551601;
create table t2 (x bigint not null); create table t2 (x bigint not null);
insert into t2(x) values (0xfffffffffffffff0); insert into t2(x) values (0xfffffffffffffff0);
@ -407,6 +409,7 @@ select count(*) from t2 where x<0;
select count(*) from t2 where x < -16; select count(*) from t2 where x < -16;
select count(*) from t2 where x = -16; select count(*) from t2 where x = -16;
select count(*) from t2 where x > -16; select count(*) from t2 where x > -16;
select count(*) from t2 where x = 18446744073709551601;
drop table t1; drop table t1;
create table t1 (x bigint unsigned not null primary key) engine=innodb; create table t1 (x bigint unsigned not null primary key) engine=innodb;
@ -419,6 +422,7 @@ select count(*) from t1 where x<0;
select count(*) from t1 where x < -16; select count(*) from t1 where x < -16;
select count(*) from t1 where x = -16; select count(*) from t1 where x = -16;
select count(*) from t1 where x > -16; select count(*) from t1 where x > -16;
select count(*) from t1 where x = 18446744073709551601;
drop table t1; drop table t1;

16
sql/item_cmpfunc.cc
View File

@ -325,6 +325,11 @@ int Arg_comparator::set_compare_func(Item_bool_func2 *item, Item_result type)
else if ((*b)->unsigned_flag) else if ((*b)->unsigned_flag)
func= &Arg_comparator::compare_int_signed_unsigned; func= &Arg_comparator::compare_int_signed_unsigned;
} }
else if (func== &Arg_comparator::compare_e_int)
{
if ((*a)->unsigned_flag ^ (*b)->unsigned_flag)
func= &Arg_comparator::compare_e_int_diff_signedness;
}
} }
return 0; return 0;
} }
@ -530,6 +535,17 @@ int Arg_comparator::compare_e_int()
return test(val1 == val2); return test(val1 == val2);
} }
/*
Compare unsigned *a with signed *b or signed *a with unsigned *b.
*/
int Arg_comparator::compare_e_int_diff_signedness()
{
longlong val1= (*a)->val_int();
longlong val2= (*b)->val_int();
if ((*a)->null_value || (*b)->null_value)
return test((*a)->null_value && (*b)->null_value);
return (val1 >= 0) && test(val1 == val2);
}
int Arg_comparator::compare_row() int Arg_comparator::compare_row()
{ {

1
sql/item_cmpfunc.h
View File

@ -74,6 +74,7 @@ public:
int compare_e_binary_string(); // compare args[0] & args[1] int compare_e_binary_string(); // compare args[0] & args[1]
int compare_e_real(); // compare args[0] & args[1] int compare_e_real(); // compare args[0] & args[1]
int compare_e_int(); // compare args[0] & args[1] int compare_e_int(); // compare args[0] & args[1]
int compare_e_int_diff_signedness();
int compare_e_row(); // compare args[0] & args[1] int compare_e_row(); // compare args[0] & args[1]
static arg_cmp_func comparator_matrix [4][2]; static arg_cmp_func comparator_matrix [4][2];