Commit 2a25659b authored by unknown's avatar unknown
Browse files

Merged from 4.1.

parent 1e140677

mysql-test/r/cast.result

+3 −3
Original line number Diff line number Diff line
@@ -334,6 +334,9 @@ cast(repeat('1',20) as signed) 
-7335632962598440505

Warnings:

Warning	1105	Cast to signed converted positive out-of-range integer to it's negative complement

select cast(1.0e+300 as signed int);

cast(1.0e+300 as signed int)

9223372036854775807

select cast('1.2' as decimal(3,2));

cast('1.2' as decimal(3,2))

1.20
@@ -367,6 +370,3 @@ DROP TABLE t1; 
select cast(NULL as decimal(6)) as t1;

t1

NULL
 
select cast(1.0e+300 as signed int);

cast(1.0e+300 as signed int)

9223372036854775807

mysql-test/r/select.result

+20 −20
Original line number Diff line number Diff line
@@ -2620,6 +2620,16 @@ select found_rows(); 
found_rows()

1

DROP TABLE t1;

CREATE TABLE t1 (a INT, b INT);

(SELECT a, b AS c FROM t1) ORDER BY c+1;

a	c

(SELECT a, b AS c FROM t1) ORDER BY b+1;

a	c

SELECT a, b AS c FROM t1 ORDER BY c+1;

a	c

SELECT a, b AS c FROM t1 ORDER BY b+1;

a	c

drop table t1;

create table t1(f1 int, f2 int);

create table t2(f3 int);

select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));
@@ -2636,6 +2646,16 @@ select * from t1,t2 where f1=f3 and (f1,f2) <=> (2,null); 
f1	f2	f3

2	NULL	2

drop table t1,t2;

create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));

create table t11 like t1;

insert into t1 values(1,""),(2,"");

show table status like 't1%';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	10	Dynamic	2	20	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

t11	MyISAM	10	Dynamic	0	0	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

select 123 as a from t1 where f1 is null;

a

drop table t1,t11;

CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

INSERT INTO t1 VALUES ('Paris');
@@ -2737,16 +2757,6 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	

1	SIMPLE	t2	ref	a	a	23	test.t1.a	2	

DROP TABLE t1, t2;

CREATE TABLE t1 (a INT, b INT);

(SELECT a, b AS c FROM t1) ORDER BY c+1;

a	c

(SELECT a, b AS c FROM t1) ORDER BY b+1;

a	c

SELECT a, b AS c FROM t1 ORDER BY c+1;

a	c

SELECT a, b AS c FROM t1 ORDER BY b+1;

a	c

drop table t1;

create table t1 (a int, b int);

create table t2 like t1;

select t1.a from (t1 inner join t2 on t1.a=t2.a) where t2.a=1;
@@ -3078,13 +3088,3 @@ from a inner join (b right join c on b.id = c.b_id) on a.id = c.a_id; 
count(*)

6

drop table a, b, c;
 
create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));

create table t11 like t1;

insert into t1 values(1,""),(2,"");

show table status like 't1%';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	9	Dynamic	2	20	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

t11	MyISAM	9	Dynamic	0	0	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

select 123 as a from t1 where f1 is null;

a

drop table t1,t11;