diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-06-05 17:51:53 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-06-05 17:51:53 +0200 |
| commit | 98708b01cb41d73e7852fff0bfb6a7f7a9297a96 (patch) | |
| tree | 3104dadb2e9997742ba562bfeec032ba729c6e40 /mysql-test/ndb | |
| parent | 253c2808b39576e0f26c2095b705123ef497005c (diff) | |
| parent | 35b2f212ba5f5cd98b9ee4bd8332012cf3bd3438 (diff) | |
| download | mariadb-git-98708b01cb41d73e7852fff0bfb6a7f7a9297a96.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
mysql-test/ndb/ndb_config_2_node.ini:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
manual merge
Diffstat (limited to 'mysql-test/ndb')
| -rw-r--r-- | mysql-test/ndb/ndb_config_2_node.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/ndb/ndb_config_2_node.ini b/mysql-test/ndb/ndb_config_2_node.ini index 302998bc79e..c0065bdb25a 100644 --- a/mysql-test/ndb/ndb_config_2_node.ini +++ b/mysql-test/ndb/ndb_config_2_node.ini @@ -13,6 +13,7 @@ TimeBetweenGlobalCheckpoints= 500 NoOfFragmentLogFiles= 4 FragmentLogFileSize=12M DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory +ODirect= 1 # the following parametes just function as a small regression # test that the parameter exists InitialNoOfOpenFiles= 27 |