database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca

Browse Source 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
This commit is contained in:
tomas@whalegate.ndb.mysql.com
2007-04-25 15:28:56 +02:00
parent be343dc78a 7d63b2d12c
commit 138264acab
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/ha_ndbcluster.cc
View File

@@ -8126,7 +8126,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 */
#ifndef DBUG_OFF
char buff[22], buff2[22], buff3[22], buff4[22];
#endif

12
sql/ha_ndbcluster_binlog.cc
View File

@@ -1021,6 +1021,7 @@ ndbcluster_update_slock(THD *thd,
const NDBTAB *ndbtab= ndbtab_g.get_table();
NdbTransaction *trans= 0;
int retries= 100;
int retry_sleep= 10; /* 10 milliseconds, transaction */
const NDBCOL *col[SCHEMA_SIZE];
unsigned sz[SCHEMA_SIZE];
@@ -1122,6 +1123,7 @@ ndbcluster_update_slock(THD *thd,
{
if (trans)
ndb->closeTransaction(trans);
my_sleep(retry_sleep);
continue; // retry
}
}
@@ -1333,6 +1335,7 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
const NDBTAB *ndbtab= ndbtab_g.get_table();
NdbTransaction *trans= 0;
int retries= 100;
int retry_sleep= 10; /* 10 milliseconds, transaction */
const NDBCOL *col[SCHEMA_SIZE];
unsigned sz[SCHEMA_SIZE];
@@ -1443,6 +1446,7 @@ err:
{
if (trans)
ndb->closeTransaction(trans);
my_sleep(retry_sleep);
continue; // retry
}
}
@@ -2841,6 +2845,11 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab,
TABLE *table= share->table;
int retries= 100;
/*
100 milliseconds, temporary error on schema operation can
take some time to be resolved
*/
int retry_sleep= 100;
while (1)
{
pthread_mutex_lock(&injector_mutex);
@@ -2969,7 +2978,10 @@ ndbcluster_create_event_ops(NDB_SHARE *share, const NDBTAB *ndbtab,
ndb->dropEventOperation(op);
pthread_mutex_unlock(&injector_mutex);
if (retries)
{
my_sleep(retry_sleep);
continue;
}
DBUG_RETURN(-1);
}
pthread_mutex_unlock(&injector_mutex);