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

Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425

Browse Source 
into mysql.com:/home/timka/mysql/src/4.1-dbg
This commit is contained in:
unknown
2005-03-10 11:50:55 +02:00
parent 16103a014f 146df30f79
commit dd843ee4b5
4 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/r/select.result
View File

@@ -2422,3 +2422,26 @@ SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';
city city
London London
DROP TABLE t1; DROP TABLE t1;
create table t1 (a int(11) unsigned, b int(11) unsigned);
insert into t1 values (1,0), (1,1), (1,2);
select a-b from t1 order by 1;
a-b
0
1
18446744073709551615
select a-b , (a-b < 0) from t1 order by 1;
a-b (a-b < 0)
0 0
1 0
18446744073709551615 0
select a-b as d, (a-b >= 0), b from t1 group by b having d >= 0;
d (a-b >= 0) b
1 1 0
0 1 1
18446744073709551615 1 2
select cast((a - b) as unsigned) from t1 order by 1;
cast((a - b) as unsigned)
0
1
18446744073709551615
drop table t1;

11
mysql-test/t/select.test
View File

@@ -1964,3 +1964,14 @@ SELECT * FROM t1 WHERE city LIKE '%london%' AND city='London';
DROP TABLE t1; DROP TABLE t1;
#
# Bug#7425 inconsistent sort order on unsigned columns result of substraction
#
create table t1 (a int(11) unsigned, b int(11) unsigned);
insert into t1 values (1,0), (1,1), (1,2);
select a-b from t1 order by 1;
select a-b , (a-b < 0) from t1 order by 1;
select a-b as d, (a-b >= 0), b from t1 group by b having d >= 0;
select cast((a - b) as unsigned) from t1 order by 1;
drop table t1;

10
sql/filesort.cc
View File

@@ -656,12 +656,18 @@ static void make_sortkey(register SORTPARAM *param,
to[3]= (uchar) (value >> 32); to[3]= (uchar) (value >> 32);
to[2]= (uchar) (value >> 40); to[2]= (uchar) (value >> 40);
to[1]= (uchar) (value >> 48); to[1]= (uchar) (value >> 48);
to[0]= (uchar) (value >> 56) ^ 128; // Fix sign if (item->unsigned_flag) /* Fix sign */
to[0]= (uchar) (value >> 56);
else
to[0]= (uchar) (value >> 56) ^ 128; /* Reverse signbit */
#else #else
to[3]= (uchar) value; to[3]= (uchar) value;
to[2]= (uchar) (value >> 8); to[2]= (uchar) (value >> 8);
to[1]= (uchar) (value >> 16); to[1]= (uchar) (value >> 16);
to[0]= (uchar) (value >> 24) ^ 128; // Fix sign if (item->unsigned_flag) /* Fix sign */
to[0]= (uchar) (value >> 24);
else
to[0]= (uchar) (value >> 24) ^ 128; /* Reverse signbit */
#endif #endif
break; break;
} }

1
sql/item.cc
View File

@@ -2281,6 +2281,7 @@ void Item_ref::set_properties()
decimals= (*ref)->decimals; decimals= (*ref)->decimals;
collation.set((*ref)->collation); collation.set((*ref)->collation);
with_sum_func= (*ref)->with_sum_func; with_sum_func= (*ref)->with_sum_func;
unsigned_flag= (*ref)->unsigned_flag;
fixed= 1; fixed= 1;
} }