List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:January 27 2011 3:37pm
Subject:bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3162)
View as plain text  
#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@stripped1c13q

 3162 Magnus Blåudd	2011-01-27
      ndb
       - fix .result file format since double and float values in 5.5
       - basically e+NNN -> eNNN, and adding one more decimal
        due to higher precision.

    modified:
      mysql-test/suite/ndb/r/ndb_alter_table_backup.result
      mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result
      mysql-test/suite/ndb/r/ndb_restore_undolog.result
      mysql-test/suite/ndb/r/ps_7ndb.result
=== modified file 'mysql-test/suite/ndb/r/ndb_alter_table_backup.result'
--- a/mysql-test/suite/ndb/r/ndb_alter_table_backup.result	2009-10-08 09:48:07 +0000
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_backup.result	2011-01-27 15:37:42 +0000
@@ -20,10 +20,10 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=ndbcluster AUTO_INCREMENT=31 DEFAULT CHARSET=latin1
 SELECT * FROM t1 WHERE a = 1 or a = 10 or a = 20 or a = 30 ORDER BY a;
 a	b	c	d	e	f	g
-1	5	3.40282e+38	1.2686868689898e+308	666.66	2007-10-23 23:23:23	1111
-10	1	-3.40282e+38	NULL	NULL	NULL	NULL
-20	1	-3.40282e+38	1.7976931348623e+308	345.21	NULL	NULL
-30	1	-3.40282e+38	1.7976931348623e+308	345.21	1000-01-01 00:00:00	0101
+1	5	3.40282e38	1.2686868689898e308	666.66	2007-10-23 23:23:23	1111
+10	1	-3.40282e38	NULL	NULL	NULL	NULL
+20	1	-3.40282e38	1.7976931348623e308	345.21	NULL	NULL
+30	1	-3.40282e38	1.7976931348623e308	345.21	1000-01-01 00:00:00	0101
 DROP TABLE t1;
 *********************************
 * restore tables w/ new column from big endian
@@ -45,8 +45,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=ndbcluster AUTO_INCREMENT=31 DEFAULT CHARSET=latin1
 SELECT * FROM t1 WHERE a = 1 or a = 10 or a = 20 or a = 30 ORDER BY a;
 a	b	c	d	e	f	g
-1	5	3.40282e+38	1.2686868689898e+308	666.66	2007-10-23 23:23:23	1111
-10	1	-3.40282e+38	NULL	NULL	NULL	NULL
-20	1	-3.40282e+38	1.7976931348623e+308	345.21	NULL	NULL
-30	1	-3.40282e+38	1.7976931348623e+308	345.21	1000-01-01 00:00:00	0101
+1	5	3.40282e38	1.2686868689898e308	666.66	2007-10-23 23:23:23	1111
+10	1	-3.40282e38	NULL	NULL	NULL	NULL
+20	1	-3.40282e38	1.7976931348623e308	345.21	NULL	NULL
+30	1	-3.40282e38	1.7976931348623e308	345.21	1000-01-01 00:00:00	0101
 DROP TABLE t1;

=== modified file 'mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result'
--- a/mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result	2010-10-27 11:32:32 +0000
+++ b/mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result	2011-01-27 15:37:42 +0000
@@ -79,7 +79,7 @@ t_pk	t_date	t_datetime	t_timestamp	t_tim
 1	1998-01-01	2006-08-10 10:11:12	2002-10-29 16:51:06	19:38:34	2155
 SELECT t_pk,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num;
 t_pk	hex(t_bit)	t_tinyint	t_bool	t_smallint	t_mediumint	t_int	t_bigint	t_float	t_double	t_decimal
-1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
+1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
 SELECT t_pk,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1;
 t_pk	t_char	t_varchar	hex(t_binary)	hex(t_varbinary)
 1	abcdefghijklmn	abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn	612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	4100
@@ -178,7 +178,7 @@ t_pk	t_date	t_datetime	t_timestamp	t_tim
 1	1998-01-01	2006-08-10 10:11:12	2002-10-29 16:51:06	19:38:34	2155
 SELECT t_pk,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num;
 t_pk	hex(t_bit)	t_tinyint	t_bool	t_smallint	t_mediumint	t_int	t_bigint	t_float	t_double	t_decimal
-1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
+1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
 SELECT t_pk,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1;
 t_pk	t_char	t_varchar	hex(t_binary)	hex(t_varbinary)
 1	abcdefghijklmn	abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn	612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	4100

=== modified file 'mysql-test/suite/ndb/r/ndb_restore_undolog.result'
--- a/mysql-test/suite/ndb/r/ndb_restore_undolog.result	2008-12-15 12:34:21 +0000
+++ b/mysql-test/suite/ndb/r/ndb_restore_undolog.result	2011-01-27 15:37:42 +0000
@@ -114,8 +114,8 @@ t_pk	t_test	t_date	t_datetime	t_timestam
 2	1	1998-01-01	2006-08-10 10:11:12	2002-10-29 16:51:06	19:38:34	2155
 SELECT t_pk,t_test,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num ORDER by t_pk;
 t_pk	t_test	hex(t_bit)	t_tinyint	t_bool	t_smallint	t_mediumint	t_int	t_bigint	t_float	t_double	t_decimal
-1	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
-2	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
+1	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
+2	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
 SELECT t_pk,t_test,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1 ORDER by t_pk;
 t_pk	t_test	t_char	t_varchar	hex(t_binary)	hex(t_varbinary)
 1	1	abcdefghijklmn	abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn	612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	4100
@@ -276,8 +276,8 @@ t_pk	t_test	t_date	t_datetime	t_timestam
 2	1	1998-01-01	2006-08-10 10:11:12	2002-10-29 16:51:06	19:38:34	2155
 SELECT t_pk,t_test,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num ORDER by t_pk;
 t_pk	t_test	hex(t_bit)	t_tinyint	t_bool	t_smallint	t_mediumint	t_int	t_bigint	t_float	t_double	t_decimal
-1	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
-2	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e+20	1e+150	331.0000000000000000
+1	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
+2	1	AAAAAAAAAAAAAAAA	125	1	32765	8388606	2147483647	9223372036854775807	1e20	1e150	331.0000000000000000
 SELECT t_pk,t_test,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1 ORDER by t_pk;
 t_pk	t_test	t_char	t_varchar	hex(t_binary)	hex(t_varbinary)
 1	1	abcdefghijklmn	abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn	612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	4100

=== modified file 'mysql-test/suite/ndb/r/ps_7ndb.result'
--- a/mysql-test/suite/ndb/r/ps_7ndb.result	2010-11-16 12:37:26 +0000
+++ b/mysql-test/suite/ndb/r/ps_7ndb.result	2011-01-27 15:37:42 +0000
@@ -2568,10 +2568,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= '9223372036854775807' ;
@@ -2591,10 +2591,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= -9223372036854775808 ;
@@ -2614,10 +2614,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-9223372036854775808' ;
@@ -2637,10 +2637,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= 1.11111111111111111111e+50 ;
@@ -2662,10 +2662,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= '1.11111111111111111111e+50' ;
@@ -2687,10 +2687,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= -1.11111111111111111111e+50 ;
@@ -2712,10 +2712,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-1.11111111111111111111e+50' ;
@@ -2737,10 +2737,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 test_sequence

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110127153742-0pne1ojghmn2722w.bundle
Thread
bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3162) Magnus Blåudd27 Jan