diff options
author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-25 15:25:56 +0200 |
---|---|---|
committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-25 15:25:56 +0200 |
commit | 868a229ca45f118c9e6e46e7e909cd9d4dd36158 (patch) | |
tree | ad9574401fee7ef02b5f8236c2cdf17af452f22c /sql/ha_ndbcluster.cc | |
parent | 0443044eb2e8ea2443cdd0d77cb64bae11c2b08b (diff) | |
parent | 10b5227bb0eed515fa2a0f41c7c184b4f720c3db (diff) | |
download | mariadb-git-868a229ca45f118c9e6e46e7e909cd9d4dd36158.tar.gz |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
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 367187cbd9c..9e4d53a36a6 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -7771,7 +7771,7 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, const NdbError error; int retries= 10; int reterr= 0; - int retry_sleep= 30 * 1000; /* 30 milliseconds */ + int retry_sleep= 30; /* 30 milliseconds, transaction */ char buff[22], buff2[22], buff3[22], buff4[22]; DBUG_ENTER("ndb_get_table_statistics"); DBUG_PRINT("enter", ("table: %s", ndbtab->getName())); |