Merge branch '10.1' into 10.2

Author: sanja-byelkin

mysql-test/t/aria_icp_debug.result renamed to mysql-test/r/aria_icp_debug.result

@@ -1186,13 +1186,13 @@ i	count(*)	std(e1/e2)
 3	4	0.00000000
 select std(s1/s2) from bug22555;
 std(s1/s2)
-0.21328517
+0.21325764
 select std(o1/o2) from bug22555;
 std(o1/o2)
 0.2132576358664934
 select std(e1/e2) from bug22555;
 std(e1/e2)
-0.21328517
+0.21325764
 set @saved_div_precision_increment=@@div_precision_increment;
 set div_precision_increment=19;
 select i, count(*), std(s1/s2) from bug22555 group by i order by i;

mysql-test/r/func_group.result

@@ -5920,14 +5920,14 @@ view_definition
 select 2 / 3 * 3 AS `2 / 3 * 3`,2 / (3 * 3) AS `2 / (3 * 3)`,2 / 3 * 3 AS `(2 / 3) * 3`
 select 2 / 3 * 3, 2 / (3 * 3), (2 / 3) * 3 union select * from v1;
 2 / 3 * 3	2 / (3 * 3)	(2 / 3) * 3
-2.00010.2222	2.0001
+2.00000.2222	2.0000
 create or replace view v1 as select 2 / 3 / 3, 2 / (3 / 3), (2 / 3) / 3;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition
 select 2 / 3 / 3 AS `2 / 3 / 3`,2 / (3 / 3) AS `2 / (3 / 3)`,2 / 3 / 3 AS `(2 / 3) / 3`
 select 2 / 3 / 3, 2 / (3 / 3), (2 / 3) / 3 union select * from v1;
 2 / 3 / 3	2 / (3 / 3)	(2 / 3) / 3
-0.222233332.0000	0.22223333
+0.222222222.0000	0.22222222
 create or replace view v1 as select 2 / 3 DIV 3, 2 / (3 DIV 3), (2 / 3) DIV 3;
 Select view_definition from information_schema.views where table_schema='test' and table_name='v1';
 view_definition

mysql-test/t/innodb_icp_debug.result renamed to mysql-test/r/innodb_icp_debug.result

@@ -2596,7 +2596,7 @@ SELECT
 population, area, population/area,
 cast(population/area as DECIMAL(20,9)) FROM t1 LIMIT 1;
 population	area	population/area	cast(population/area as DECIMAL(20,9))
-11797	91	129.6374	129.637400000
+11797	91	129.6374	129.637362637
 SELECT * FROM t1 A
 WHERE population/area = (SELECT MAX(population/area) from t1 B where A.region = B.region);
 region	area	population

mysql-test/t/myisam_icp_debug.result renamed to mysql-test/r/myisam_icp_debug.result

@@ -1532,8 +1532,11 @@ select (1.20396873 * 0.89550000 * 0.68000000 * 1.08721696 * 0.99500000 *
 1.01500000 * 1.01500000 * 0.99500000)
 0.81298807395367312459230693948000000000
 create table t1 as select 5.05 / 0.014;
+Warnings:
+Note	1265	Data truncated for column '5.05 / 0.014' at row 1
 show warnings;
 Level	Code	Message
+Note	1265	Data truncated for column '5.05 / 0.014' at row 1
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1648,6 +1651,8 @@ my_col
 0.12345678912345678912345678912345678912
 DROP TABLE t1;
 CREATE TABLE t1 SELECT 1 / .123456789123456789123456789123456789123456789123456789123456789123456789123456789 AS my_col;
+Warnings:
+Note	1265	Data truncated for column 'my_col' at row 1
 DESCRIBE t1;
 Field	Type	Null	Key	Default	Extra
 my_col	decimal(65,4)	YES	NULL

mysql-test/r/precedence.result

@@ -91,6 +91,8 @@ DROP INDEX test ON t1;
 insert into t1 values (10, 1,1,1,1,1,1,1,1,1,1,1,1,1,NULL,0,0,0,1,1,1,1,'one','one');
 insert into t1 values (NULL,2,2,2,2,2,2,2,2,2,2,2,2,2,NULL,NULL,NULL,NULL,NULL,NULL,2,2,'two','two,one');
 insert ignore into t1 values (0,1/3,3,3,3,3,3,3,3,3,3,3,3,3,NULL,'19970303','10:10:10','19970303101010','','','','3',3,3);
+Warnings:
+Warning	1265	Data truncated for column 'string' at row 1
 insert ignore into t1 values (0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,NULL,19970807,080706,19970403090807,-1,-1,-1,'-1',-1,-1);
 Warnings:
 Warning	1264	Out of range value for column 'utiny' at row 1
@@ -128,7 +130,7 @@ select auto,string,tiny,short,medium,long_int,longlong,real_float,real_double,ut
 auto	string	tiny	short	medium	long_int	longlong	real_float	real_double	utiny	ushort	umedium	ulong	ulonglong	mod(floor(time_stamp/1000000),1000000)-mod(curdate(),1000000)	date_field	time_field	date_time	blob_col	tinyblob_col	mediumblob_col	longblob_col
 10	1	1	1	1	1	1	1.0	1.0000	1	00001	1	1	1	0	0000-00-00	00:00:00	0000-00-00 00:00:00	1	1	1	1
 11	2	2	2	2	2	2	2.0	2.0000	2	00002	2	2	2	0	NULL	NULL	NULL	NULL	NULL	2	2
-12	0.33333	3	3	3	3	3.0	3.0000	3	00003	3	3	3	0	1997-03-03	10:10:10	1997-03-03 10:10:10	3
+12	0.333333333	3	3	3	3	3.0	3.0000	3	00003	3	3	3	0	1997-03-03	10:10:10	1997-03-03 10:10:10	3
 13	-1	-1	-1	-1	-1	-1	-1.0	-1.0000	0	00000	0	0	0	0	1997-08-07	08:07:06	1997-04-03 09:08:07	-1	-1	-1	-1
 14	-429496729	-128	-32768	-8388608	-2147483648	-4294967295	-4294967296.0	-4294967295.0000	0	00000	0	0	0	0	0000-00-00	00:00:00	0000-00-00 00:00:00	-4294967295	-4294967295	-4294967295	-4294967295
 15	4294967295	127	32767	8388607	2147483647	4294967295	4294967296.0	4294967295.0000	255	65535	16777215	4294967295	4294967295	0	0000-00-00	00:00:00	0000-00-00 00:00:00	4294967295	4294967295	4294967295	4294967295
@@ -180,7 +182,7 @@ Warning	1265	Data truncated for column 'new_field' at row 7
 select * from t2;
 auto	string	mediumblob_col	new_field
 1	2	2	ne
-2	0.3333ne
+2	0.33333333ne
 3	-1	-1	ne
 4	-429496729	-4294967295	ne
 5	4294967295	4294967295	ne

mysql-test/r/subselect4.result

@@ -51,9 +51,9 @@ INSERT into t1(name, salary, income_tax) values('Record_2', 501, 501*2.5/1000);
 INSERT into t1(name, salary, income_tax) values('Record_3', 210, 210*2.5/1000);
 SELECT * from t1;
 id	name	salary	income_tax
-1	Record_1	100011	250.03
-2	Record_2	501	1.25
-3	Record_3	210	0.53
+1	Record_1	100011	250.027
+2	Record_2	501	1.2525
+3	Record_3	210	0.525
 connect test_con2, localhost, root,,;
 connection test_con2;
 ## Verifying session & global value of variable ##
@@ -69,11 +69,11 @@ INSERT into t1(name, salary, income_tax) values('Record_5', 501, 501*2.5/1000);
 INSERT into t1(name, salary, income_tax) values('Record_6', 210, 210*2.5/1000);
 SELECT * from t1;
 id	name	salary	income_tax
-1	Record_1	100011	250.03
-2	Record_2	501	1.25
-3	Record_3	210	0.53
-4	Record_4	100011	250.028
-5	Record_5	501	1.253
+1	Record_1	100011	250.027
+2	Record_2	501	1.2525
+3	Record_3	210	0.525
+4	Record_4	100011	250.027
+5	Record_5	501	1.2525
 6	Record_6	210	0.525
 ## Dropping table t1 ##
 drop table t1;

mysql-test/r/type_newdecimal.result

@@ -29,7 +29,7 @@ set time_zone='+1:00';
 flush tables;
 select * from t1;
 a	b	v
-1	2	0.3333000000000000000
+1	2	0.3333333330000000000
 select * from t8;
 a	b	v
 1234567890	2	2009-02-14 00:31:30