bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4543 to 4544) Bug#12543299

[jonas oreland]

 4544 jonas oreland	2011-09-22
      ndb - bug#12543299 - increase default values of ndb-wait-connected and ndb-wait-setup to 30 from 0 and 15 resp. This is there previously was a "hidden" wait of 30s that now has been removed

    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
 4543 jonas oreland	2011-09-22
      ndb - reclassify 899 back to temporary...(We suspect that it might happen e.g during replica switch-over)

    modified:
      storage/ndb/src/ndbapi/ndberror.c
=== 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 13:47:52 +0000
+++ b/sql/ha_ndbcluster.cc	2011-09-22 14:43:45 +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 */

No bundle (reason: useless for push emails).