Commit 8a27426f authored by unknown's avatar unknown
Browse files

Tests and results fixed with last precision/decimal related modifications 


mysql-test/r/case.result:
  test result fixed
mysql-test/r/create.result:
  test result fixed
mysql-test/r/distinct.result:
  test result fixed
mysql-test/r/func_group.result:
  test result fixed
mysql-test/r/func_op.result:
  test result fixed
mysql-test/r/group_by.result:
  test result fixed
mysql-test/r/metadata.result:
  test result fixed
mysql-test/r/olap.result:
  test result fixed
mysql-test/r/ps_2myisam.result:
  test result fixed
mysql-test/r/ps_3innodb.result:
  test result fixed
mysql-test/r/ps_4heap.result:
  test result fixed
mysql-test/r/ps_5merge.result:
  test result fixed
mysql-test/r/ps_6bdb.result:
  test result fixed
mysql-test/r/ps_7ndb.result:
  test result fixed
mysql-test/r/select.result:
  test result fixed
mysql-test/r/sp.result:
  test result fixed
mysql-test/r/type_decimal.result:
  test result fixed
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/r/union.result:
  test result fixed
mysql-test/r/variables.result:
  test result fixed
mysql-test/t/func_group.test:
  test modified
mysql-test/t/olap.test:
  test modified
mysql-test/t/type_decimal.test:
  test modified
parent a8e4fbcb

mysql-test/r/case.result

+5 −5
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ t1 CREATE TABLE `t1` ( 
  `c4` varbinary(1) NOT NULL default '',

  `c5` varbinary(4) NOT NULL default '',

  `c6` varbinary(4) NOT NULL default '',

  `c7` decimal(5,1) NOT NULL default '0.0',

  `c8` decimal(5,1) NOT NULL default '0.0',

  `c9` decimal(5,1) default NULL,

  `c7` decimal(2,1) NOT NULL default '0.0',

  `c8` decimal(2,1) NOT NULL default '0.0',

  `c9` decimal(2,1) default NULL,

  `c10` double NOT NULL default '0',

  `c11` double NOT NULL default '0',

  `c12` varbinary(5) NOT NULL default ''
@@ -152,9 +152,9 @@ SHOW CREATE TABLE t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `COALESCE(1)` int(1) NOT NULL default '0',

  `COALESCE(1.0)` decimal(5,1) NOT NULL default '0.0',

  `COALESCE(1.0)` decimal(2,1) NOT NULL default '0.0',

  `COALESCE('a')` varchar(1) NOT NULL default '',

  `COALESCE(1,1.0)` decimal(5,1) NOT NULL default '0.0',

  `COALESCE(1,1.0)` decimal(2,1) NOT NULL default '0.0',

  `COALESCE(1,'1')` varbinary(1) NOT NULL default '',

  `COALESCE(1.1,'1')` varbinary(4) NOT NULL default '',

  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''

mysql-test/r/create.result

+4 −4
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ Field Type Null Key Default Extra 
a	datetime	NO		0000-00-00 00:00:00	

b	time	NO		00:00:00	

c	date	NO		0000-00-00	

d	int(2)	NO		0	

e	decimal(6,1)	NO		0.0	

f	bigint(18)	NO		0	

d	int(3)	NO		0	

e	decimal(3,1)	NO		0.0	

f	bigint(19)	NO		0	

drop table t2;

create table t2 select CAST("2001-12-29" AS DATE) as d, CAST("20:45:11" AS TIME) as t, CAST("2001-12-29  20:45:11" AS DATETIME) as dt;

describe t2;
@@ -453,7 +453,7 @@ t2 CREATE TABLE `t2` ( 
  `ifnull(e,e)` bigint(20) default NULL,

  `ifnull(f,f)` float(3,2) default NULL,

  `ifnull(g,g)` double(4,3) default NULL,

  `ifnull(h,h)` decimal(6,4) default NULL,

  `ifnull(h,h)` decimal(5,4) default NULL,

  `ifnull(i,i)` year(4) default NULL,

  `ifnull(j,j)` date default NULL,

  `ifnull(k,k)` datetime NOT NULL default '0000-00-00 00:00:00',

mysql-test/r/distinct.result

+1 −1
Original line number Diff line number Diff line
@@ -462,5 +462,5 @@ rout int(11) default '0' 
INSERT INTO t1 VALUES ('1',1,0);

SELECT DISTINCT html,SUM(rout)/(SUM(rin)+1) as 'prod' FROM t1 GROUP BY rin;

html	prod

1	0.00000

1	0.0000

drop table t1;

mysql-test/r/func_group.result

+30 −24
Original line number Diff line number Diff line 
drop table if exists t1,t2;

set @sav_dpi= @@div_precision_increment;

set div_precision_increment= 5;

show variables like 'div_precision_increment';

Variable_name	Value

div_precision_increment	5

create table t1 (grp int, a bigint unsigned, c char(10) not null);

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

insert into t1 values (2,2,"b");
@@ -44,13 +49,13 @@ count(distinct a) count(distinct grp) 
6	3

select sum(all a),count(all a),avg(all a),std(all a),variance(all a),bit_or(all a),bit_and(all a),min(all a),max(all a),min(all c),max(all c) from t1;

sum(all a)	count(all a)	avg(all a)	std(all a)	variance(all a)	bit_or(all a)	bit_and(all a)	min(all a)	max(all a)	min(all c)	max(all c)

21	6	3.5000	1.7078	2.9167	7	0	1	6		E

21	6	3.50000	1.70783	2.91667	7	0	1	6		E

select grp, sum(a),count(a),avg(a),std(a),variance(a),bit_or(a),bit_and(a),min(a),max(a),min(c),max(c) from t1 group by grp;

grp	sum(a)	count(a)	avg(a)	std(a)	variance(a)	bit_or(a)	bit_and(a)	min(a)	max(a)	min(c)	max(c)

NULL	NULL	0	NULL	NULL	NULL	0	18446744073709551615	NULL	NULL		

1	1	1	1.0000	0.0000	0.0000	1	1	1	1	a	a

2	5	2	2.5000	0.5000	0.2500	3	2	2	3	b	c

3	15	3	5.0000	0.8165	0.6667	7	4	4	6	C	E

1	1	1	1.00000	0.00000	0.00000	1	1	1	1	a	a

2	5	2	2.50000	0.50000	0.25000	3	2	2	3	b	c

3	15	3	5.00000	0.81650	0.66667	7	4	4	6	C	E

select grp, sum(a)+count(a)+avg(a)+std(a)+variance(a)+bit_or(a)+bit_and(a)+min(a)+max(a)+min(c)+max(c) as sum from t1 group by grp;

grp	sum

NULL	NULL
@@ -74,12 +79,12 @@ CREATE TABLE t2 (id int(11),name char(20)); 
INSERT INTO t2 VALUES (1,'Set One'),(2,'Set Two');

select id, avg(value1), std(value1), variance(value1) from t1 group by id;

id	avg(value1)	std(value1)	variance(value1)

1	1.000000	0.816497	0.666667

2	11.000000	0.816497	0.666667

1	1.0000000	0.816497	0.666667

2	11.0000000	0.816497	0.666667

select name, avg(value1), std(value1), variance(value1) from t1, t2 where t1.id = t2.id group by t1.id;

name	avg(value1)	std(value1)	variance(value1)

Set One	1.000000	0.816497	0.666667

Set Two	11.000000	0.816497	0.666667

Set One	1.0000000	0.816497	0.666667

Set Two	11.0000000	0.816497	0.666667

drop table t1,t2;

create table t1 (id int not null);

create table t2 (id int not null,rating int null);
@@ -87,19 +92,19 @@ insert into t1 values(1),(2),(3); 
insert into t2 values(1, 3),(2, NULL),(2, NULL),(3, 2),(3, NULL);

select t1.id, avg(rating) from t1 left join t2 on ( t1.id = t2.id ) group by t1.id;

id	avg(rating)

1	3.0000

1	3.00000

2	NULL

3	2.0000

3	2.00000

select sql_small_result t2.id, avg(rating) from t2 group by t2.id;

id	avg(rating)

1	3.0000

1	3.00000

2	NULL

3	2.0000

3	2.00000

select sql_big_result t2.id, avg(rating) from t2 group by t2.id;

id	avg(rating)

1	3.0000

1	3.00000

2	NULL

3	2.0000

3	2.00000

select sql_small_result t2.id, avg(rating+0.0e0) from t2 group by t2.id;

id	avg(rating+0.0e0)

1	3
@@ -265,22 +270,22 @@ insert into t1 values (2,1); 
select a,count(b), sum(b), avg(b), std(b), min(b), max(b), bit_and(b), bit_or(b) from t1 group by a;

a	count(b)	sum(b)	avg(b)	std(b)	min(b)	max(b)	bit_and(b)	bit_or(b)

1	0	NULL	NULL	NULL	NULL	NULL	18446744073709551615	0

2	1	1	1.0000	0.0000	1	1	1	1

2	1	1	1.00000	0.00000	1	1	1	1

select SQL_BIG_RESULT a,count(b), sum(b), avg(b), std(b), min(b), max(b), bit_and(b), bit_or(b) from t1 group by a;

a	count(b)	sum(b)	avg(b)	std(b)	min(b)	max(b)	bit_and(b)	bit_or(b)

1	0	NULL	NULL	NULL	NULL	NULL	18446744073709551615	0

2	1	1	1.0000	0.0000	1	1	1	1

2	1	1	1.00000	0.00000	1	1	1	1

insert into t1 values (3,1);

select a,count(b), sum(b), avg(b), std(b), min(b), max(b), bit_and(b), bit_or(b) from t1 group by a;

a	count(b)	sum(b)	avg(b)	std(b)	min(b)	max(b)	bit_and(b)	bit_or(b)

1	0	NULL	NULL	NULL	NULL	NULL	18446744073709551615	0

2	1	1	1.0000	0.0000	1	1	1	1

3	1	1	1.0000	0.0000	1	1	1	1

2	1	1	1.00000	0.00000	1	1	1	1

3	1	1	1.00000	0.00000	1	1	1	1

select SQL_BIG_RESULT a,count(b), sum(b), avg(b), std(b), min(b), max(b), bit_and(b), bit_or(b), bit_xor(b) from t1 group by a;

a	count(b)	sum(b)	avg(b)	std(b)	min(b)	max(b)	bit_and(b)	bit_or(b)	bit_xor(b)

1	0	NULL	NULL	NULL	NULL	NULL	18446744073709551615	0	0

2	1	1	1.0000	0.0000	1	1	1	1	1

3	1	1	1.0000	0.0000	1	1	1	1	1

2	1	1	1.00000	0.00000	1	1	1	1	1

3	1	1	1.00000	0.00000	1	1	1	1	1

explain extended select SQL_BIG_RESULT a,count(b), sum(b), avg(b), std(b), min(b), max(b), bit_and(b), bit_or(b), bit_xor(b) from t1 group by a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using filesort
@@ -837,10 +842,10 @@ INSERT INTO t1 VALUES (-5.00000000001),(-5.00000000002),(-5.00000000003),(-5.000 
insert into t1 select * from t1;

select col1,count(col1),sum(col1),avg(col1) from t1 group by col1;

col1	count(col1)	sum(col1)	avg(col1)

-5.000000000030	2	-10.000000000060	-5.0000000000300000

-5.000000000020	4	-20.000000000080	-5.0000000000200000

-5.000000000010	4	-20.000000000040	-5.0000000000100000

-5.000000000000	2	-10.000000000000	-5.0000000000000000

-5.000000000030	2	-10.000000000060	-5.00000000003000000

-5.000000000020	4	-20.000000000080	-5.00000000002000000

-5.000000000010	4	-20.000000000040	-5.00000000001000000

-5.000000000000	2	-10.000000000000	-5.00000000000000000

DROP TABLE t1;

create table t1 (col1 decimal(16,12));

insert into t1 values (-5.00000000001);
@@ -947,3 +952,4 @@ SUM(a) 
6

6

DROP TABLE t1;

set div_precision_increment= @sav_dpi;

mysql-test/r/func_op.result

+1 −1
Original line number Diff line number Diff line 
select 1+1,1-1,1+1*2,8/5,8%5,mod(8,5),mod(8,5)|0,-(1+1)*-2;

1+1	1-1	1+1*2	8/5	8%5	mod(8,5)	mod(8,5)|0	-(1+1)*-2

2	0	3	1.60000	3	3	3	4

2	0	3	1.6000	3	3	3	4

explain extended select 1+1,1-1,1+1*2,8/5,8%5,mod(8,5),mod(8,5)|0,-(1+1)*-2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used