Commit 4e69c153 authored by unknown's avatar unknown
Browse files

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

into  zim.tangent.org:/home/brian/mysql/mysql-5.0
parents a207c820 49a09cc3

mysql-test/ndb/ndbcluster.sh

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ if [ ! -x "$exec_waiter" ]; then 
fi



exec_mgmtclient="$exec_mgmtclient --no-defaults $NDB_MGM_EXTRA_OPTS"

exec_mgmtsrvr="$exec_mgmtsrvr $NDB_MGMD_EXTRA_OPTS"

exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $NDB_MGMD_EXTRA_OPTS"

exec_ndb="$exec_ndb --no-defaults $NDBD_EXTRA_OPTS"

exec_waiter="$exec_waiter --no-defaults"

mysql-test/r/subselect.result

+3 −3
Original line number Diff line number Diff line
@@ -215,9 +215,9 @@ select * from t1 where t1.a=(select t2.a from t2 where t2.b=(select max(a) from 
a

select b,(select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2) from t4;

b	(select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2)

8	7.5000

8	4.5000

9	7.5000

8	7.5

8	4.5

9	7.5

explain extended select b,(select avg(t2.a+(select min(t3.a) from t3 where t3.a >= t4.a)) from t2) from t4;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t4	ALL	NULL	NULL	NULL	NULL	3

mysql-test/r/type_float.result

+22 −0
Original line number Diff line number Diff line
@@ -240,6 +240,28 @@ t3 CREATE TABLE `t3` ( 
  `d` double(22,9) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1, t2, t3;

create table t1 select  105213674794682365.00 + 0.0 x;

show warnings;

Level	Code	Message

desc  t1;

Field	Type	Null	Key	Default	Extra

x	decimal(21,2) unsigned	NO		0.00	

drop table t1;

create table t1 select 0.0 x;

desc t1;

Field	Type	Null	Key	Default	Extra

x	decimal(2,1) unsigned	NO		0.0	

create table t2 select 105213674794682365.00 y;

desc t2;

Field	Type	Null	Key	Default	Extra

y	decimal(20,2) unsigned	NO		0.00	

create table t3 select x+y a from t1,t2;

show warnings;

Level	Code	Message

desc t3;

Field	Type	Null	Key	Default	Extra

a	decimal(21,2) unsigned	NO		0.00	

drop table t1,t2,t3;

create table t1 (s1 float(0,2));

ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').

create table t1 (s1 float(1,2));

mysql-test/t/func_math.test

+2 −0
Original line number Diff line number Diff line
@@ -121,7 +121,9 @@ drop table t1; 
#

# InnoDB is required to reproduce the fault, but it is okay if we default to

# MyISAM when testing.

--disable_warnings

create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default charset=utf8;

--enable_warnings

insert into t1 values ('http://www.foo.com/', now());

select a from t1 where a='http://www.foo.com/' order by abs(timediff(ts, 0));

drop table t1;

mysql-test/t/type_float.test

+17 −0
Original line number Diff line number Diff line
@@ -159,6 +159,23 @@ show create table t3; 
drop table t1, t2, t3;





#

# Bug #9855 (inconsistent column type for create select

#

create table t1 select  105213674794682365.00 + 0.0 x;

show warnings;

desc  t1;

drop table t1;



create table t1 select 0.0 x;

desc t1;

create table t2 select 105213674794682365.00 y;

desc t2;

create table t3 select x+y a from t1,t2;

show warnings;

desc t3;

drop table t1,t2,t3;



# End of 4.1 tests



#