List:Commits« Previous MessageNext Message »
From:jonas oreland Date:September 22 2011 5:15pm
Subject:bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4286 to 4289)
View as plain text  
 4289 jonas oreland	2011-09-22 [merge]
      ndb - merge 70 to 71

 4288 jonas oreland	2011-09-22
      ndb - bump version to 7.1.17

    modified:
      configure.in
      storage/ndb/ndb_configure.m4
 4287 jonas oreland	2011-09-22 {clone-mysql-5.1.56-ndb-7.1.16-src-build} [merge]
      ndb - merge 70 to 71

    modified:
      mysql-test/suite/ndb/my.cnf
      mysql-test/suite/ndb_binlog/my.cnf
      mysql-test/suite/ndb_rpl/my.cnf
      mysql-test/suite/ndb_team/my.cnf
      mysql-test/suite/rpl_ndb/my.cnf
      sql/ha_ndbcluster.cc
      storage/ndb/src/ndbapi/ndberror.c
 4286 Frazer Clement	2011-09-21 [merge]
      Merge 7.0->7.1

    modified:
      mysql-test/suite/binlog/t/binlog_killed.test
=== modified file 'configure.in'
--- a/configure.in	2011-09-21 10:30:37 +0000
+++ b/configure.in	2011-09-22 17:12:20 +0000
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.56-ndb-7.1.16], [], [mysql])
+AC_INIT([MySQL Server], [5.1.56-ndb-7.1.17], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

=== modified file 'mysql-test/suite/ndb/my.cnf'
--- a/mysql-test/suite/ndb/my.cnf	2011-04-15 09:34:10 +0000
+++ b/mysql-test/suite/ndb/my.cnf	2011-09-22 14:43:45 +0000
@@ -38,7 +38,7 @@ NodeId=255
 [mysqld]
 # Make all mysqlds use cluster
 ndbcluster
-ndb-wait-connected=20
+ndb-wait-connected=30
 ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 ndb-extra-logging=99

=== modified file 'mysql-test/suite/ndb_binlog/my.cnf'
--- a/mysql-test/suite/ndb_binlog/my.cnf	2011-04-15 09:31:03 +0000
+++ b/mysql-test/suite/ndb_binlog/my.cnf	2011-09-22 14:43:45 +0000
@@ -11,7 +11,7 @@ ndbapi=,,,,,,,,,,,
 [mysqld]
 # Make all mysqlds use cluster
 ndbcluster
-ndb-wait-connected=20
+ndb-wait-connected=30
 ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 ndb-extra-logging=99

=== modified file 'mysql-test/suite/ndb_rpl/my.cnf'
--- a/mysql-test/suite/ndb_rpl/my.cnf	2011-06-08 19:25:29 +0000
+++ b/mysql-test/suite/ndb_rpl/my.cnf	2011-09-22 14:43:45 +0000
@@ -21,7 +21,7 @@ ndbapi=,,,,
 [mysqld]
 # Make all mysqlds use cluster
 ndbcluster
-ndb-wait-connected=20
+ndb-wait-connected=30
 ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 slave-allow-batching

=== modified file 'mysql-test/suite/ndb_team/my.cnf'
--- a/mysql-test/suite/ndb_team/my.cnf	2011-06-08 19:25:29 +0000
+++ b/mysql-test/suite/ndb_team/my.cnf	2011-09-22 14:43:45 +0000
@@ -18,7 +18,7 @@ ndbapi=,,,,
 [mysqld]
 # Make all mysqlds use cluster
 ndbcluster
-ndb-wait-connected=20
+ndb-wait-connected=30
 ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 loose-slave-allow-batching

=== modified file 'mysql-test/suite/rpl_ndb/my.cnf'
--- a/mysql-test/suite/rpl_ndb/my.cnf	2011-06-08 19:25:29 +0000
+++ b/mysql-test/suite/rpl_ndb/my.cnf	2011-09-22 14:43:45 +0000
@@ -21,7 +21,7 @@ ndbapi=,,,,
 [mysqld]
 # Make all mysqlds use cluster
 ndbcluster
-ndb-wait-connected=20
+ndb-wait-connected=30
 ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 slave-allow-batching

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-09-15 15:14:16 +0000
+++ b/sql/ha_ndbcluster.cc	2011-09-22 17:00:01 +0000
@@ -16978,7 +16978,7 @@ static MYSQL_SYSVAR_ULONG(
   "to cluster management and data nodes.",
   NULL,                              /* check func. */
   NULL,                              /* update func. */
-  0,                                 /* default */
+  30,                                /* default */
   0,                                 /* min */
   ONE_YEAR_IN_SECONDS,               /* max */
   0                                  /* block */
@@ -16993,7 +16993,7 @@ static MYSQL_SYSVAR_ULONG(
   "complete (0 = no wait)",
   NULL,                              /* check func. */
   NULL,                              /* update func. */
-  15,                                /* default */
+  30,                                /* default */
   0,                                 /* min */
   ONE_YEAR_IN_SECONDS,               /* max */
   0                                  /* block */

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2011-09-06 07:46:41 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-09-22 17:12:20 +0000
@@ -2,7 +2,7 @@
 # Should be updated when creating a new NDB version
 NDB_VERSION_MAJOR=7
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=16
+NDB_VERSION_BUILD=17
 NDB_VERSION_STATUS=""
 
 dnl ---------------------------------------------------------------------------

=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2011-09-14 13:14:02 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2011-09-22 17:00:01 +0000
@@ -187,7 +187,7 @@ ErrorBundle ErrorCodes[] = {
   { 805,  DMEC, TR, "Out of attrinfo records in tuple manager" },
   { 830,  DMEC, TR, "Out of add fragment operation records" },
   { 873,  DMEC, TR, "Out of attrinfo records for scan in tuple manager" },
-  { 899,  DMEC, IE, "Internal error: rowid already allocated" },
+  { 899,  DMEC, TR, "Rowid already allocated" },
   { 1217, DMEC, TR, "Out of operation records in local data manager (increase MaxNoOfLocalOperations)" },
   { 1218, DMEC, TR, "Send Buffers overloaded in NDB kernel" },
   { 1220, DMEC, TR, "REDO log files overloaded (increase FragmentLogFileSize)" },

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4286 to 4289) jonas oreland23 Sep