Commit fd534e03 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
parents b8ae1138 50f32533

mysql-test/r/range.result

+2 −2
Original line number Diff line number Diff line
@@ -521,8 +521,8 @@ select count(*) from t1 where x = 18446744073709551601; 
count(*)

1

create table t2 (x bigint not null);

insert into t2(x) values (cast(0xfffffffffffffff0+0 as signed));

insert into t2(x) values (cast(0xfffffffffffffff1+0 as signed));

insert into t2(x) values (-16);

insert into t2(x) values (-15);

select * from t2;

x

-16

mysql-test/r/select.result

+17 −0
Original line number Diff line number Diff line
@@ -2811,6 +2811,23 @@ select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5; 
min(key1)

0.37619999051094

DROP TABLE t1,t2;

create table t1(a bigint unsigned, b bigint);

insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff), 

(0x10000000000000000, 0x10000000000000000), 

(0x8fffffffffffffff, 0x8fffffffffffffff);

Warnings:

Warning	1264	Out of range value adjusted for column 'a' at row 1

Warning	1264	Out of range value adjusted for column 'b' at row 1

Warning	1264	Out of range value adjusted for column 'a' at row 2

Warning	1264	Out of range value adjusted for column 'b' at row 2

Warning	1264	Out of range value adjusted for column 'b' at row 3

select hex(a), hex(b) from t1;

hex(a)	hex(b)

FFFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

FFFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

8FFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

drop table t1;

End of 4.1 tests

CREATE TABLE t1 ( 

K2C4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '', 

K4N4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '0000',

mysql-test/r/type_bit.result

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ create table t1 (a bit(7)); 
insert into t1 values (0x60);

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	a	a	16	7	1	Y	0	0	63

def	test	t1	t1	a	a	16	7	1	Y	32	0	63

a

`

drop table t1;

mysql-test/r/type_bit_innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ create table t1 (a bit(7)) engine=innodb; 
insert into t1 values (0x60);

select * from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def	test	t1	t1	a	a	16	7	1	Y	0	0	63

def	test	t1	t1	a	a	16	7	1	Y	32	0	63

a

`

drop table t1;

mysql-test/t/range.test

+2 −2
Original line number Diff line number Diff line
@@ -406,8 +406,8 @@ select count(*) from t1 where x = 18446744073709551601; 




create table t2 (x bigint not null);

insert into t2(x) values (cast(0xfffffffffffffff0+0 as signed));

insert into t2(x) values (cast(0xfffffffffffffff1+0 as signed));

insert into t2(x) values (-16);

insert into t2(x) values (-15);

select * from t2;

select count(*) from t2 where x>0;

select count(*) from t2 where x=0;