mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
This commit is contained in:
commit
f5a6461e47
1 changed files with 0 additions and 1 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue