merge with 5.1-micro

1 files changed, 21 insertions, 21 deletions

diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index c99d5596ace..6b7434390af 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -64,7 +64,7 @@ def	test	t9	t9	c12	c12	246	10	6	Y	0	4	63
 def	test	t9	t9	c13	c13	10	10	10	Y	128	0	63
 def	test	t9	t9	c14	c14	12	19	19	Y	128	0	63
 def	test	t9	t9	c15	c15	7	19	19	N	9377	0	63
-def	test	t9	t9	c16	c16	11	9	8	Y	128	0	63
+def	test	t9	t9	c16	c16	11	10	8	Y	128	0	63
 def	test	t9	t9	c17	c17	13	4	4	Y	32864	0	63
 def	test	t9	t9	c18	c18	1	4	1	Y	32768	0	63
 def	test	t9	t9	c19	c19	1	1	1	Y	32768	0	63
@@ -1776,8 +1776,8 @@ t5	CREATE TABLE `t5` (
   `param08` longtext,
   `const09` datetime DEFAULT NULL,
   `param09` longblob,
-  `const10` double NOT NULL DEFAULT '0',
-  `param10` double DEFAULT NULL,
+  `const10` decimal(22,6) NOT NULL DEFAULT '0.000000',
+  `param10` decimal(65,30) DEFAULT NULL,
   `const11` int(4) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
@@ -1806,8 +1806,8 @@ def	test	t5	t5	const08	const08	253	19	19	N	1	0	8
 def	test	t5	t5	param08	param08	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	144	0	63
-def	test	t5	t5	const10	const10	5	49	9	N	32769	31	63
-def	test	t5	t5	param10	param10	5	23	9	Y	32768	31	63
+def	test	t5	t5	const10	const10	246	24	16	N	1	6	63
+def	test	t5	t5	param10	param10	246	67	40	Y	0	30	63
 def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
@@ -1833,8 +1833,8 @@ const08	1991-08-05 01:01:01
 param08	1991-08-05 01:01:01
 const09	1991-08-05 01:01:01
 param09	1991-08-05 01:01:01
-const10	662680861
-param10	662680861
+const10	662680861.000000
+param10	662680861.000000000000000000000000000000
 const11	1991
 param11	1991
 const12	NULL
@@ -3198,7 +3198,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3208,7 +3208,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt1 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3219,7 +3219,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3230,7 +3230,7 @@ Warnings:
 Warning	1265	Data truncated for column 'c13' at row 1
 Warning	1265	Data truncated for column 'c14' at row 1
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 1.0e+10 ;
 insert into t9
@@ -3239,7 +3239,7 @@ values
 ( 50, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10, 1.0e+10 ) ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 insert into t9
 ( c1, c13, c14, c15, c16, c17 )
@@ -3256,7 +3256,7 @@ values
 execute stmt1 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 prepare stmt2 from "insert into t9
   ( c1, c13, c14, c15, c16, c17 )
@@ -3265,7 +3265,7 @@ values
 execute stmt2 using @arg00, @arg00, @arg00, @arg00, @arg00 ;
 Warnings:
 Warning	1265	Data truncated for column 'c15' at row 1
-Warning	1264	Out of range value for column 'c16' at row 1
+Warning	1265	Data truncated for column 'c16' at row 1
 Warning	1264	Out of range value for column 'c17' at row 1
 set @arg00= 'abc' ;
 set @arg00= NULL ;
@@ -3321,14 +3321,14 @@ c1	c13	c14	c15	c16	c17
 31	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 32	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
 33	1991-01-01	1991-01-01 01:01:01	1991-01-01 01:01:01	01:01:01	1991
-40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+40	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+41	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
+53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	00:00:00	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 61	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
 62	NULL	NULL	1991-01-01 01:01:01	NULL	NULL