bk commit into 5.1 tree (mikron:1.2461)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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-03-06 01:24:29+01:00, mikron@stripped +1 -0
  Removed duplicates

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@stripped, 2007-03-06 01:24:26+01:00, mikron@stripped +0 -3
    Removed duplicates

# 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:	mikron
# Host:	25.37.251.10.in-addr.arpa
# Root:	/Users/mikron/mysql_clones/build_bench

--- 1.35/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2007-02-21 09:52:14 +01:00
+++ 1.36/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2007-03-06 01:24:26 +01:00
@@ -104,9 +104,6 @@
 #define CFG_DB_STRING_MEMORY          161 /* used from 5.1 */
 #define CFG_DB_INITIAL_OPEN_FILES     162 /* used from 5.1 */
 
-#define CFG_DB_DISK_PAGE_BUFFER_MEMORY 160
-#define CFG_DB_STRING_MEMORY          161
-
 #define CFG_DB_DISK_SYNCH_SIZE        163
 #define CFG_DB_CHECKPOINT_SPEED       164
 #define CFG_DB_CHECKPOINT_SPEED_SR    165