Commit 63c7a66d authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
parents 132dba00 f5a6461e
...@@ -6280,7 +6280,6 @@ void Dbtc::timeOutLoopStartLab(Signal* signal, Uint32 api_con_ptr) ...@@ -6280,7 +6280,6 @@ void Dbtc::timeOutLoopStartLab(Signal* signal, Uint32 api_con_ptr)
if (api_timer != 0) { if (api_timer != 0) {
Uint32 error= ZTIME_OUT_ERROR; Uint32 error= ZTIME_OUT_ERROR;
time_out_value= time_out_param + (ndb_rand() & mask_value); time_out_value= time_out_param + (ndb_rand() & mask_value);
ndbout_c("timeout value: %u %u",time_out_value, time_out_value-time_out_param);
if (unlikely(old_mask_value)) // abort during single user mode if (unlikely(old_mask_value)) // abort during single user mode
{ {
apiConnectptr.i = api_con_ptr; apiConnectptr.i = api_con_ptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment