diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 18:59:56 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 18:59:56 +0100 |
| commit | 92e3070ca35bd38f23daf335c341ebb55fdb7d21 (patch) | |
| tree | 574b739f957d429abe3ed0d4fd05270077c39639 /sql/ha_ndbcluster.cc | |
| parent | f4cef73bd76a2ce138b32e405d5d898f824ec76d (diff) | |
| parent | 6b38100d6146cae344aaf90d77c0f4475ea30bb8 (diff) | |
| download | mariadb-git-92e3070ca35bd38f23daf335c341ebb55fdb7d21.tar.gz | |
Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 47cca937544..3e2fc5b2855 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4407,7 +4407,7 @@ bool ndbcluster_init() DBUG_PRINT("info",("NDBCLUSTER storage engine at %s on port %d", g_ndb_cluster_connection->get_connected_host(), g_ndb_cluster_connection->get_connected_port())); - g_ndb_cluster_connection->wait_until_ready(10,0); + g_ndb_cluster_connection->wait_until_ready(10,3); } else if(res == 1) { |