bk commit into 5.1 tree (tomas:1.2471) BUG#28653

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-24 16:50:38+02:00, tomas@stripped +1 -0
  Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
  - correction, use recomputed _actual_ redobuffer

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-05-24 16:50:35+02:00,
tomas@stripped +5 -5
    Bug #28653    Fast GCP + high load + high RedoBuffer causes ndbrequire
    - correction, use recomputed _actual_ redobuffer

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-gca

--- 1.138/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-05-24 16:40:03 +02:00
+++ 1.139/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-05-24 16:50:35 +02:00
@@ -992,11 +992,6 @@
   ndb_mgm_get_int_parameter(p, CFG_DB_REDO_BUFFER,  
 			    &log_page_size);
 
-  /* maximum number of log file operations */
-  clfoFileSize = (log_page_size+32768-1)/32768;
-  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
-    clfoFileSize = ZLFO_MIN_FILE_SIZE;
-
   /**
    * Always set page size in half MBytes
    */
@@ -1006,6 +1001,11 @@
     jam();
     clogPageFileSize+= (16 - mega_byte_part);
   }
+
+  /* maximum number of log file operations */
+  clfoFileSize = clogPageFileSize;
+  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
+    clfoFileSize = ZLFO_MIN_FILE_SIZE;
 
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TABLE, &ctabrecFileSize));
   ndbrequire(!ndb_mgm_get_int_parameter(p, CFG_LQH_TC_CONNECT,