Commit aac2575b authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 

into deer.(none):/home/hf/work/mysql-4.1.13372


sql/item.cc:
  Auto merged
parents 5d2bc925 0834f7d3

mysql-test/r/type_decimal.result

+16 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1, t2, t3;

SET SQL_WARNINGS=1;

CREATE TABLE t1 (

id int(11) NOT NULL auto_increment,
@@ -655,3 +655,18 @@ select * from t1; 
a	b

123.12345	123.1

drop table t1;

create table t1 (d decimal(10,1));

create table t2 (d decimal(10,9));

insert into t1 values ("100000000.0");

insert into t2 values ("1.23456780");

create table t3 select * from t2 union select * from t1;

select * from t3;

d

1.234567800

100000000.000000000

show create table t3;

Table	Create Table

t3	CREATE TABLE `t3` (

  `d` decimal(18,9) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1, t2, t3;

mysql-test/r/type_float.result

+15 −0
Original line number Diff line number Diff line
@@ -235,3 +235,18 @@ select * from t1 where reckey=1.09E2; 
reckey	recdesc

109	Has 109 as key

drop table t1;

create table t1 (d double(10,1));

create table t2 (d double(10,9));

insert into t1 values ("100000000.0");

insert into t2 values ("1.23456780");

create table t3 select * from t2 union select * from t1;

select * from t3;

d

1.234567800

100000000.000000000

show create table t3;

Table	Create Table

t3	CREATE TABLE `t3` (

  `d` double(22,9) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1, t2, t3;

mysql-test/r/union.result

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ a 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` double(53,1) NOT NULL default '0.0'

  `a` double(21,1) NOT NULL default '0.0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t2 (it1 tinyint, it2 tinyint not null, i int not null, ib bigint, f float, d double, y year, da date, dt datetime, sc char(10), sv varchar(10), b blob, tx text);

mysql-test/t/type_decimal.test

+13 −1
Original line number Diff line number Diff line 
# bug in decimal() with negative numbers by kaido@tradenet.ee



--disable_warnings

DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1, t2, t3;

--enable_warnings

SET SQL_WARNINGS=1;
@@ -276,4 +276,16 @@ update t1 set b=a; 
select * from t1;                                                               

drop table t1;                                                                  



#

# Bug #13372 (decimal union)

#

create table t1 (d decimal(10,1));

create table t2 (d decimal(10,9));

insert into t1 values ("100000000.0");

insert into t2 values ("1.23456780");

create table t3 select * from t2 union select * from t1;

select * from t3;

show create table t3;

drop table t1, t2, t3;



# End of 4.1 tests

mysql-test/t/type_float.test

+13 −0
Original line number Diff line number Diff line
@@ -149,4 +149,17 @@ select * from t1 where reckey=109; 
select * from t1 where reckey=1.09E2;

drop table t1;



#

# Bug #13372 (decimal union)

#

create table t1 (d double(10,1));

create table t2 (d double(10,9));

insert into t1 values ("100000000.0");

insert into t2 values ("1.23456780");

create table t3 select * from t2 union select * from t1;

select * from t3;

show create table t3;

drop table t1, t2, t3;





# End of 4.1 tests