summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <tomas@whalegate.ndb.mysql.com>2007-05-28 12:56:48 +0200
committerunknown <tomas@whalegate.ndb.mysql.com>2007-05-28 12:56:48 +0200
commitd41bc07359c68780f467278aec2b3f0abea5020e (patch)
tree40db5a2be02a5336e4dd1d9a0eb0f776b0f69acd
parent9202b48b5e4f37fdfafe69073c2aebc0e3d8f895 (diff)
downloadmariadb-git-d41bc07359c68780f467278aec2b3f0abea5020e.tar.gz
Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire
- correction, backport to 5.0
-rw-r--r--ndb/src/kernel/blocks/dblqh/DblqhInit.cpp5
-rw-r--r--ndb/src/kernel/blocks/dblqh/DblqhMain.cpp5
2 files changed, 5 insertions, 5 deletions
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
index 65f4b0f9b4b..adeed3e1e8b 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
@@ -338,6 +338,11 @@ Dblqh::Dblqh(const class Configuration & conf):
initData();
+ /* maximum number of log file operations */
+ clfoFileSize = clogPageFileSize;
+ if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
+ clfoFileSize = ZLFO_MIN_FILE_SIZE;
+
#ifdef VM_TRACE
{
void* tmp[] = {
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 88bc3f372a5..684598364ab 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -7251,11 +7251,6 @@ void Dblqh::continueScanNextReqLab(Signal* signal)
return;
}
- /* maximum number of log file operations */
- clfoFileSize = clogPageFileSize;
- if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
- clfoFileSize = ZLFO_MIN_FILE_SIZE;
-
// Update timer on tcConnectRecord
tcConnectptr.p->tcTimer = cLqhTimeOutCount;
init_acc_ptr_list(scanptr.p);