bzr push into mysql-5.5-cluster-7.2 branch (jonas.oreland:3802 to 3803)

[jonas oreland]

 3803 jonas oreland	2012-02-01 [merge]
      ndb - merge 71 to 72

    modified:
      mysql-test/suite/ndb/r/ndb_statistics0.result
      mysql-test/suite/ndb/r/ndb_statistics1.result
      mysql-test/suite/ndb/t/ndb_index_stat.test
      mysql-test/suite/ndb/t/ndb_index_stat_restart.test
      mysql-test/suite/ndb/t/ndb_statistics.inc
      mysql-test/suite/ndb/t/ndb_statistics0.test
      mysql-test/suite/ndb/t/ndb_statistics1.test
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 3802 jonas oreland	2012-01-31 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
=== modified file 'mysql-test/suite/ndb/r/ndb_statistics0.result'
--- a/mysql-test/suite/ndb/r/ndb_statistics0.result	2011-12-09 11:57:48 +0000
+++ b/mysql-test/suite/ndb/r/ndb_statistics0.result	2012-02-01 17:39:06 +0000
@@ -34,12 +34,10 @@ CREATE TABLE t100 LIKE t10;
 INSERT INTO t100(I,J)
 SELECT X.J, X.J+(10*Y.J) FROM t10 AS X,t10 AS Y;
 CREATE TABLE t10000 LIKE t10;
+ALTER TABLE t10000 ENGINE=MYISAM;
 INSERT INTO t10000(I,J)
-SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y
-WHERE X.J<50;
-INSERT INTO t10000(I,J)
-SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y
-WHERE X.J>=50;
+SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y;
+ALTER TABLE t10000 ENGINE=NDBCLUSTER;
 ANALYZE TABLE t10,t100,t10000;
 Table	Op	Msg_type	Msg_text
 test.t10	analyze	status	OK

=== modified file 'mysql-test/suite/ndb/r/ndb_statistics1.result'
--- a/mysql-test/suite/ndb/r/ndb_statistics1.result	2011-12-09 11:57:48 +0000
+++ b/mysql-test/suite/ndb/r/ndb_statistics1.result	2012-02-01 17:39:06 +0000
@@ -30,12 +30,10 @@ CREATE TABLE t100 LIKE t10;
 INSERT INTO t100(I,J)
 SELECT X.J, X.J+(10*Y.J) FROM t10 AS X,t10 AS Y;
 CREATE TABLE t10000 LIKE t10;
+ALTER TABLE t10000 ENGINE=MYISAM;
 INSERT INTO t10000(I,J)
-SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y
-WHERE X.J<50;
-INSERT INTO t10000(I,J)
-SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y
-WHERE X.J>=50;
+SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y;
+ALTER TABLE t10000 ENGINE=NDBCLUSTER;
 ANALYZE TABLE t10,t100,t10000;
 Table	Op	Msg_type	Msg_text
 test.t10	analyze	status	OK

=== modified file 'mysql-test/suite/ndb/t/ndb_index_stat.test'
--- a/mysql-test/suite/ndb/t/ndb_index_stat.test	2011-11-19 07:56:25 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index_stat.test	2012-02-01 11:59:01 +0000
@@ -19,6 +19,7 @@ DROP TABLE IF EXISTS t1, t2;
 --enable_warnings
 
 set @is_enable_default = @@global.ndb_index_stat_enable;
+let is_table_exists = `select count(*) <> 2 from information_schema.tables where table_name in ('ndb_index_stat_head', 'ndb_index_stat_sample') and table_schema='mysql'`;
 
 set @is_enable = 1;
 source ndb_index_stat_enable.inc;

=== modified file 'mysql-test/suite/ndb/t/ndb_index_stat_restart.test'
--- a/mysql-test/suite/ndb/t/ndb_index_stat_restart.test	2011-11-30 12:39:03 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index_stat_restart.test	2012-02-01 11:59:01 +0000
@@ -6,6 +6,7 @@ DROP TABLE IF EXISTS t1;
 --enable_warnings
 
 set @is_enable_default = @@global.ndb_index_stat_enable;
+let is_table_exists = `select count(*) <> 2 from information_schema.tables where table_name in ('ndb_index_stat_head', 'ndb_index_stat_sample') and table_schema='mysql'`;
 
 set @is_enable = 1;
 source ndb_index_stat_enable.inc;

=== modified file 'mysql-test/suite/ndb/t/ndb_statistics.inc'
--- a/mysql-test/suite/ndb/t/ndb_statistics.inc	2011-07-02 07:05:32 +0000
+++ b/mysql-test/suite/ndb/t/ndb_statistics.inc	2012-02-01 10:23:10 +0000
@@ -21,14 +21,12 @@ INSERT INTO t100(I,J)
 
 CREATE TABLE t10000 LIKE t10;
 
-# Insert into t10000 in two chunks to not
-#  exhaust MaxNoOfConcurrentOperations
+# Insert into t10000 into myisam and alter to ndb
+#  not to exhaust MaxNoOfConcurrentOperations
+ALTER TABLE t10000 ENGINE=MYISAM;
 INSERT INTO t10000(I,J)
-  SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y
-  WHERE X.J<50;
-INSERT INTO t10000(I,J)
-  SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y
-  WHERE X.J>=50;
+  SELECT X.J, X.J+(100*Y.J) FROM t100 AS X,t100 AS Y;
+ALTER TABLE t10000 ENGINE=NDBCLUSTER;
 
 ANALYZE TABLE t10,t100,t10000;
 

=== modified file 'mysql-test/suite/ndb/t/ndb_statistics0.test'
--- a/mysql-test/suite/ndb/t/ndb_statistics0.test	2011-07-02 07:05:32 +0000
+++ b/mysql-test/suite/ndb/t/ndb_statistics0.test	2012-02-01 11:12:24 +0000
@@ -1,6 +1,7 @@
 # index stats OFF
 
 set @is_enable_default = @@global.ndb_index_stat_enable;
+let is_table_exists = `select count(*) <> 2 from information_schema.tables where table_name in ('ndb_index_stat_head', 'ndb_index_stat_sample') and table_schema='mysql'`;
 
 set @is_enable = 0;
 source ndb_index_stat_enable.inc;

=== modified file 'mysql-test/suite/ndb/t/ndb_statistics1.test'
--- a/mysql-test/suite/ndb/t/ndb_statistics1.test	2011-07-02 07:05:32 +0000
+++ b/mysql-test/suite/ndb/t/ndb_statistics1.test	2012-02-01 11:12:24 +0000
@@ -1,6 +1,7 @@
 # index stats ON
 
 set @is_enable_default = @@global.ndb_index_stat_enable;
+let is_table_exists = `select count(*) <> 2 from information_schema.tables where table_name in ('ndb_index_stat_head', 'ndb_index_stat_sample') and table_schema='mysql'`;
 
 set @is_enable = 1;
 source ndb_index_stat_enable.inc;

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-01-26 08:15:55 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-02-01 17:39:06 +0000
@@ -3155,7 +3155,8 @@ handle_reorg_trigger(DiGetNodesConf * co
   {
     conf->fragId = conf->nodes[MAX_REPLICAS];
     conf->reqinfo = conf->nodes[MAX_REPLICAS+1];
-    memcpy(conf->nodes, conf->nodes+MAX_REPLICAS+2, sizeof(conf->nodes));
+    memcpy(conf->nodes, conf->nodes+MAX_REPLICAS+2,
+           sizeof(Uint32)*MAX_REPLICAS);
   }
   else
   {

No bundle (reason: useless for push emails).