Commit e75e10dd authored by unknown's avatar unknown
Browse files

func_group.test, func_str.result, func_group.result: 

  after merge fixes


mysql-test/r/func_group.result:
  after merge fixes
mysql-test/r/func_str.result:
  after merge fixes
mysql-test/t/func_group.test:
  after merge fixes
parent a12b0b28

mysql-test/r/func_group.result

+1 −0
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ select id, stddev_pop(value1), var_pop(value1), stddev_samp(value1), var_samp(va 
id	stddev_pop(value1)	var_pop(value1)	stddev_samp(value1)	var_samp(value1)

1	0.816497	0.666667	1.000000	1.000000

2	1.118034	1.250000	1.290994	1.666667

DROP TABLE t1;

CREATE TABLE t1(

id int PRIMARY KEY,

a  int,

mysql-test/r/func_str.result

+31 −302

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/t/func_group.test

+1 −0
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ drop table t1, t2, t3; 
CREATE TABLE t1 (id int(11),value1 float(10,2));

INSERT INTO t1 VALUES (1,0.00),(1,1.00), (1,2.00), (2,10.00), (2,11.00), (2,12.00), (2,13.00);

select id, stddev_pop(value1), var_pop(value1), stddev_samp(value1), var_samp(value1) from t1 group by id;

DROP TABLE t1;

#

# Bug 8893: wrong result for min/max optimization with 2 indexes

#