Commit 5aaa74a4 authored by mskold/marty@linux.site's avatar mskold/marty@linux.site

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
parents 201705a4 48649030
...@@ -3924,9 +3924,9 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) ...@@ -3924,9 +3924,9 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
"%ld(%d e/s), total time %ld(%d e/s)", "%ld(%d e/s), total time %ld(%d e/s)",
(ulong)gci, event_count, (ulong)gci, event_count,
write_timer.elapsed_ms(), write_timer.elapsed_ms(),
event_count / write_timer.elapsed_ms(), (1000*event_count) / write_timer.elapsed_ms(),
gci_timer.elapsed_ms(), gci_timer.elapsed_ms(),
event_count / gci_timer.elapsed_ms()); (1000*event_count) / gci_timer.elapsed_ms());
#endif #endif
} }
} }
......
...@@ -7208,7 +7208,8 @@ void Dblqh::execACC_ABORTCONF(Signal* signal) ...@@ -7208,7 +7208,8 @@ void Dblqh::execACC_ABORTCONF(Signal* signal)
TRACE_OP(regTcPtr, "ACC_ABORTCONF"); TRACE_OP(regTcPtr, "ACC_ABORTCONF");
signal->theData[0] = regTcPtr->tupConnectrec; signal->theData[0] = regTcPtr->tupConnectrec;
EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1); EXECUTE_DIRECT(DBTUP, GSN_TUP_ABORTREQ, signal, 1);
jamEntry();
continueAbortLab(signal); continueAbortLab(signal);
return; return;
}//Dblqh::execACC_ABORTCONF() }//Dblqh::execACC_ABORTCONF()
......
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