bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4311 to 4312)

[Magnus Blåudd]

 4312 Magnus Blåudd	2011-04-15 [merge]
      Merge 6.3 -> 7.0

    modified:
      mysql-test/suite/ndb/my.cnf
      mysql-test/suite/ndb_binlog/my.cnf
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf
      mysql-test/suite/ndb_team/my.cnf
      mysql-test/suite/rpl_ndb/my.cnf
 4311 jonas oreland	2011-04-15
      ndb - "fix" funcs_1.ndb_storedproc_06 by rerecording result file (broke in latest mainline merge)...no brain...just rerecord

    modified:
      mysql-test/suite/funcs_1/r/ndb_storedproc_06.result
=== modified file 'mysql-test/suite/ndb/my.cnf'
--- a/mysql-test/suite/ndb/my.cnf	2010-12-08 11:00:49 +0000
+++ b/mysql-test/suite/ndb/my.cnf	2011-04-15 09:34:10 +0000
@@ -39,7 +39,7 @@ NodeId=255
 # Make all mysqlds use cluster
 ndbcluster
 ndb-wait-connected=20
-ndb-wait-setup=60
+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	2009-10-23 14:31:33 +0000
+++ b/mysql-test/suite/ndb_binlog/my.cnf	2011-04-15 09:31:03 +0000
@@ -12,7 +12,7 @@ ndbapi=,,,,,,,,,,,
 # Make all mysqlds use cluster
 ndbcluster
 ndb-wait-connected=20
-ndb-wait-setup=60
+ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 ndb-extra-logging=99
 

=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf	2009-10-23 14:02:54 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.cnf	2011-04-15 09:31:03 +0000
@@ -15,7 +15,7 @@ ndbapi=,,,,,,,,,,,
 # Make all mysqlds use cluster
 ndbcluster
 ndb-wait-connected=20
-ndb-wait-setup=60
+ndb-wait-setup=120
 ndb-cluster-connection-pool=1
 binlog-format=row
 

=== modified file 'mysql-test/suite/ndb_team/my.cnf'
--- a/mysql-test/suite/ndb_team/my.cnf	2009-10-23 14:31:33 +0000
+++ b/mysql-test/suite/ndb_team/my.cnf	2011-04-15 09:31:03 +0000
@@ -19,7 +19,7 @@ ndbapi=,,,,
 # Make all mysqlds use cluster
 ndbcluster
 ndb-wait-connected=20
-ndb-wait-setup=60
+ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 loose-slave-allow-batching
 loose-ndb-log-orig

=== modified file 'mysql-test/suite/rpl_ndb/my.cnf'
--- a/mysql-test/suite/rpl_ndb/my.cnf	2010-10-12 11:54:35 +0000
+++ b/mysql-test/suite/rpl_ndb/my.cnf	2011-04-15 09:31:03 +0000
@@ -19,7 +19,7 @@ ndbapi=,,,,
 # Make all mysqlds use cluster
 ndbcluster
 ndb-wait-connected=20
-ndb-wait-setup=60
+ndb-wait-setup=120
 ndb-cluster-connection-pool=3
 slave-allow-batching
 ndb-log-orig

No bundle (reason: useless for push emails).