bzr push into mysql-trunk-cluster branch (pekka.nousiainen:3467 to 3468) WL#946

[Pekka Nousiainen]

 3468 Pekka Nousiainen	2012-04-05
      wl#946 x02_fix.diff
      missing sum() in query check

    modified:
      mysql-test/suite/ndb/r/ndb_wl946_main.result
      mysql-test/suite/ndb/t/ndb_wl946_main_query.inc
 3467 Pekka Nousiainen	2012-04-05
      wl#946 x01_fix.diff
      avoid show create of old meta on solaris

    modified:
      mysql-test/suite/ndb/r/ndb_wl946_post.result
      mysql-test/suite/ndb/t/ndb_wl946_post.test
=== modified file 'mysql-test/suite/ndb/r/ndb_wl946_main.result'
--- a/mysql-test/suite/ndb/r/ndb_wl946_main.result	2012-04-03 11:47:44 +0000
+++ b/mysql-test/suite/ndb/r/ndb_wl946_main.result	2012-04-05 12:48:47 +0000
@@ -86,9 +86,9 @@ a	b	c	d	e	f
 select * from t1 where f = '1979-12-28 20:02:06.999';
 a	b	c	d	e	f
 379	2011	2007-12-01	-13:38:50.785	8321-12-27 21:08:47.878	1979-12-28 20:02:06.999
-select sum(cnt), crc32(concat(cnt,crc)) from t1sum;
-sum(cnt)	crc32(concat(cnt,crc))
-69971	1991287409
+select sum(cnt), sum(crc32(concat(cnt,crc))) from t1sum;
+sum(cnt)	sum(crc32(concat(cnt,crc)))
+69971	828138701178
 # check results via myisam
 alter table t1 engine=myisam;
 show create table t1;
@@ -125,9 +125,9 @@ a	b	c	d	e	f
 select * from t1 where f = '1979-12-28 20:02:06.999';
 a	b	c	d	e	f
 379	2011	2007-12-01	-13:38:50.785	8321-12-27 21:08:47.878	1979-12-28 20:02:06.999
-select sum(cnt), crc32(concat(cnt,crc)) from t1sum;
-sum(cnt)	crc32(concat(cnt,crc))
-69971	1991287409
+select sum(cnt), sum(crc32(concat(cnt,crc))) from t1sum;
+sum(cnt)	sum(crc32(concat(cnt,crc)))
+69971	828138701178
 # drop table prec 3
 drop table t1;
 # create table prec 6
@@ -203,9 +203,9 @@ a	b	c	d	e	f
 select * from t1 where f = '2032-03-16 20:53:59.869710';
 a	b	c	d	e	f
 95	1984	2099-12-21	15:11:51.840792	1917-01-19 09:13:16.715589	2032-03-16 20:53:59.869710
-select sum(cnt), crc32(concat(cnt,crc)) from t1sum;
-sum(cnt)	crc32(concat(cnt,crc))
-69575	1553898447
+select sum(cnt), sum(crc32(concat(cnt,crc))) from t1sum;
+sum(cnt)	sum(crc32(concat(cnt,crc)))
+69575	874482681592
 # check results via myisam
 alter table t1 engine=myisam;
 show create table t1;
@@ -242,9 +242,9 @@ a	b	c	d	e	f
 select * from t1 where f = '2032-03-16 20:53:59.869710';
 a	b	c	d	e	f
 95	1984	2099-12-21	15:11:51.840792	1917-01-19 09:13:16.715589	2032-03-16 20:53:59.869710
-select sum(cnt), crc32(concat(cnt,crc)) from t1sum;
-sum(cnt)	crc32(concat(cnt,crc))
-69575	1553898447
+select sum(cnt), sum(crc32(concat(cnt,crc))) from t1sum;
+sum(cnt)	sum(crc32(concat(cnt,crc)))
+69575	874482681592
 # drop table prec 6
 drop table t1;
 # PART 2: backup and restore

=== modified file 'mysql-test/suite/ndb/t/ndb_wl946_main_query.inc'
--- a/mysql-test/suite/ndb/t/ndb_wl946_main_query.inc	2012-04-03 11:47:44 +0000
+++ b/mysql-test/suite/ndb/t/ndb_wl946_main_query.inc	2012-04-05 12:48:47 +0000
@@ -505,4 +505,4 @@ insert into t1sum select 499, count(*),
 
 --enable_query_log
 
-select sum(cnt), crc32(concat(cnt,crc)) from t1sum;
+select sum(cnt), sum(crc32(concat(cnt,crc))) from t1sum;

No bundle (reason: useless for push emails).