From: Jonas Oreland
Date: September 5 2011 9:34am
Subject: bzr push into mysql-5.5-cluster branch (jonas.oreland:3458 to 3460)
List-Archive: http://lists.mysql.com/commits/140913
Message-Id: <20110905093452.5E37291B7A4@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3460 Jonas Oreland	2011-09-05
      ndb - update 5.5 version to 7.2.1

    modified:
      VERSION
      mysql-test/suite/ndb/my.cnf
      mysql-test/suite/ndb/r/ndb_blob_big.result
      mysql-test/suite/ndb/r/ndb_dd_alter.result
      mysql-test/suite/ndb/t/ndb_blob_big.test
      storage/ndb/VERSION
 3459 Jonas Oreland	2011-09-05
      ndb - add "main.kill" do disabled.def, same problem as martin working on (92% sure)

    modified:
      mysql-test/t/disabled.def
 3458 jonas oreland	2011-09-04 [merge]
      ndb - merge 71 to 55

    added:
      mysql-test/suite/ndb/ndb_config_threadconfig.ini
    modified:
      mysql-test/suite/ndb/r/ndb_config.result
      mysql-test/suite/ndb/t/ndb_config.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_1.inc
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/Configuration.hpp
      storage/ndb/src/kernel/vm/dummy_mt.cpp
      storage/ndb/src/kernel/vm/dummy_nonmt.cpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/kernel/vm/mt.hpp
      storage/ndb/src/kernel/vm/mt_thr_config.cpp
      storage/ndb/src/kernel/vm/mt_thr_config.hpp
      storage/ndb/src/mgmsrv/CMakeLists.txt
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
=== modified file 'VERSION'
--- a/VERSION	2011-08-31 10:39:08 +0000
+++ b/VERSION	2011-09-05 09:32:41 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
 MYSQL_VERSION_PATCH=15
-MYSQL_VERSION_EXTRA=-ndb-7.1.16
+MYSQL_VERSION_EXTRA=-ndb-7.2.1

=== modified file 'mysql-test/suite/ndb/my.cnf'
--- a/mysql-test/suite/ndb/my.cnf	2011-06-23 06:59:40 +0000
+++ b/mysql-test/suite/ndb/my.cnf	2011-09-05 09:32:41 +0000
@@ -43,6 +43,7 @@ ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 ndb-extra-logging=99
 ndb-join-pushdown=1
+ndb-index-stat-enable=0
 
 [ENV]
 NDB_CONNECTSTRING=             @mysql_cluster.1.ndb_connectstring

=== modified file 'mysql-test/suite/ndb/r/ndb_blob_big.result'
--- a/mysql-test/suite/ndb/r/ndb_blob_big.result	2011-01-14 11:51:58 +0000
+++ b/mysql-test/suite/ndb/r/ndb_blob_big.result	2011-09-05 09:32:41 +0000
@@ -32,7 +32,7 @@ call heavy_insert(20, 5*1024*1024);
 delete from t1;
 set ndb_blob_write_batch_bytes=100 * 1024;
 Now heavy insert should succeed
-call heavy_insert(10, 9*1024*1024);
+call heavy_insert(10, 5*1024*1024);
 Now heavy read should fail
 call heavy_read(100);
 set ndb_blob_read_batch_bytes=100 * 1024;

=== modified file 'mysql-test/suite/ndb/r/ndb_dd_alter.result'
--- a/mysql-test/suite/ndb/r/ndb_dd_alter.result	2011-06-08 12:00:29 +0000
+++ b/mysql-test/suite/ndb/r/ndb_dd_alter.result	2011-09-05 09:32:41 +0000
@@ -399,7 +399,7 @@ a8 Time NULL AT=FIXED ST=DISK
 a9 Datetime NULL AT=FIXED ST=DISK
 a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
 a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
-a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a12 Text(256,13948,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 SELECT a1, a2,a3,hex(a4),a5,a6,a7,a8,a9,a10,a11,a12,a13 FROM test.t1 ORDER BY a1;
@@ -470,7 +470,7 @@ a8 Time NULL AT=FIXED ST=DISK
 a9 Datetime NULL AT=FIXED ST=DISK
 a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
 a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
-a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a12 Text(256,13948,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 ALTER TABLE test.t1 DROP INDEX a2_i;
@@ -506,7 +506,7 @@ a8 Time NULL AT=FIXED ST=DISK
 a9 Datetime NULL AT=FIXED ST=DISK
 a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
 a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
-a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a12 Text(256,13948,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 TRUNCATE TABLE test.t1;
@@ -542,7 +542,7 @@ a8 Time NULL AT=FIXED ST=DISK
 a9 Datetime NULL AT=FIXED ST=DISK
 a10 Text(256,0,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=<none>
 a11 Text(256,4000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
-a12 Text(256,8000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
+a12 Text(256,13948,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 a13 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 a14 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=DISK BV=2 BT=NDB$BLOB_#_#
 ALTER TABLE test.t1 DROP a14;

=== modified file 'mysql-test/suite/ndb/t/ndb_blob_big.test'
--- a/mysql-test/suite/ndb/t/ndb_blob_big.test	2011-01-14 11:51:58 +0000
+++ b/mysql-test/suite/ndb/t/ndb_blob_big.test	2011-09-05 09:32:41 +0000
@@ -51,7 +51,7 @@ delete from t1;
 set ndb_blob_write_batch_bytes=100 * 1024;
 
 --echo Now heavy insert should succeed
-call heavy_insert(10, 9*1024*1024);
+call heavy_insert(10, 5*1024*1024);
 
 --echo Now heavy read should fail
 

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2011-09-01 07:25:09 +0000
+++ b/mysql-test/t/disabled.def	2011-09-05 07:48:52 +0000
@@ -19,4 +19,5 @@ file_contents            : Bug#12585902
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 mysql_embedded           : Bug#12561297 seems to be fixed in 5.5.16 (I verified that it fails also in tag:mysql-5.5.15)
 innodb_mysql_sync        : Merge problems, DEBUG_SYNC wait conditions are not identical, Martin working on it
+kill                     : Merge problems, DEBUG_SYNC wait conditions are not identical, Martin working on it
 

=== modified file 'storage/ndb/VERSION'
--- a/storage/ndb/VERSION	2011-08-17 10:36:01 +0000
+++ b/storage/ndb/VERSION	2011-09-05 09:32:41 +0000
@@ -1,6 +1,6 @@
 # The NDB version number and status.
 # Should be updated when creating a new NDB version
 NDB_VERSION_MAJOR=7
-NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=16
+NDB_VERSION_MINOR=2
+NDB_VERSION_BUILD=1
 NDB_VERSION_STATUS=""

No bundle (reason: useless for push emails).