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
1.1997 06/03/27 20:24:53 tomas@stripped +4 -0
manual merge
storage/ndb/test/run-test/conf-ndbmaster.txt
1.7 06/03/27 20:24:47 tomas@stripped +4 -2
manual merge
storage/ndb/test/run-test/Makefile.am
1.26 06/03/27 20:24:47 tomas@stripped +3 -8
manual merge
storage/ndb/test/run-test/conf-dl145a.txt
1.1 06/03/27 20:24:12 tomas@stripped +22 -0
storage/ndb/test/run-test/conf-dl145a.txt
1.0 06/03/27 20:24:12 tomas@stripped +0 -0
BitKeeper file /home/tomas/wl2325-alcatel/storage/ndb/test/run-test/conf-dl145a.txt
storage/ndb/test/run-test/conf-shark.txt
1.1 06/03/27 20:24:07 tomas@stripped +22 -0
storage/ndb/test/run-test/conf-shark.txt
1.0 06/03/27 20:24:07 tomas@stripped +0 -0
BitKeeper file /home/tomas/wl2325-alcatel/storage/ndb/test/run-test/conf-shark.txt
storage/ndb/test/run-test/conf-ndbmaster.txt
1.6 06/03/27 20:20:59 tomas@stripped +0 -0
Rename: storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt -> storage/ndb/test/run-test/conf-ndbmaster.txt
# 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: poseidon.ndb.mysql.com
# Root: /home/tomas/wl2325-alcatel
--- 1.5/storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt 2006-01-23 11:46:17 +01:00
+++ 1.7/storage/ndb/test/run-test/conf-ndbmaster.txt 2006-03-27 20:24:47 +02:00
@@ -7,8 +7,7 @@
[DB DEFAULT]
NoOfReplicas: 2
IndexMemory: 100M
-DataMemory: 155M
-DataMemory2: 155M
+DataMemory: 300M
BackupMemory: 64M
MaxNoOfConcurrentScans: 100
DataDir: .
@@ -18,3 +17,6 @@
PortNumber: 14000
ArbitrationRank: 1
DataDir: .
+
+[TCP DEFAULT]
+SendBufferMemory: 2M
--- 1.25/storage/ndb/test/run-test/Makefile.am 2005-09-15 12:30:51 +02:00
+++ 1.26/storage/ndb/test/run-test/Makefile.am 2006-03-27 20:24:47 +02:00
@@ -7,14 +7,9 @@
test_PROGRAMS = atrt
test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \
- conf-daily-basic-ndbmaster.txt \
- conf-daily-basic-shark.txt \
- conf-daily-devel-ndbmaster.txt \
- conf-daily-sql-ndbmaster.txt \
- conf-daily-basic-dl145a.txt \
- conf-daily-basic-ndb08.txt \
- conf-daily-devel-ndb08.txt \
- conf-daily-sql-ndb08.txt
+ conf-ndbmaster.txt \
+ conf-shark.txt \
+ conf-dl145a.txt
test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh
--- New file ---
+++ storage/ndb/test/run-test/conf-dl145a.txt 06/03/27 20:24:12
baseport: 14000
basedir: /home/ndbdev/autotest/run
mgm: CHOOSE_host1
ndb: CHOOSE_host2 CHOOSE_host3
api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
IndexMemory: 100M
DataMemory: 300M
BackupMemory: 64M
MaxNoOfConcurrentScans: 100
DataDir: .
FileSystemPath: /home/ndbdev/autotest/run
[MGM DEFAULT]
PortNumber: 14000
ArbitrationRank: 1
DataDir: .
[TCP DEFAULT]
SendBufferMemory: 2M
--- New file ---
+++ storage/ndb/test/run-test/conf-shark.txt 06/03/27 20:24:07
baseport: 14000
basedir: /space/autotest
mgm: CHOOSE_host1
ndb: CHOOSE_host1 CHOOSE_host1
api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1
-- cluster config
[DB DEFAULT]
NoOfReplicas: 2
IndexMemory: 100M
DataMemory: 300M
BackupMemory: 64M
MaxNoOfConcurrentScans: 100
DataDir: .
FileSystemPath: /space/autotest/run
[MGM DEFAULT]
PortNumber: 14000
ArbitrationRank: 1
DataDir: .
[TCP DEFAULT]
SendBufferMemory: 2M
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.1997) | tomas | 27 Mar |
