bk commit into 5.0 tree (tomas:1.2415)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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.2415 07/02/14 15:33:48 tomas@stripped +2 -0
  ndb_config_4_node.ini, ndb_config_1_node.ini:
    new file

  mysql-test/ndb/ndb_config_4_node.ini
    1.1 07/02/14 15:27:33 tomas@stripped +52 -0

  mysql-test/ndb/ndb_config_4_node.ini
    1.0 07/02/14 15:27:33 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.0-ndb/mysql-test/ndb/ndb_config_4_node.ini

  mysql-test/ndb/ndb_config_1_node.ini
    1.1 07/02/14 15:27:30 tomas@stripped +43 -0

  mysql-test/ndb/ndb_config_1_node.ini
    1.0 07/02/14 15:27:30 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.0-ndb/mysql-test/ndb/ndb_config_1_node.ini

# 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.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb
--- New file ---
+++ mysql-test/ndb/ndb_config_1_node.ini	07/02/14 15:27:30
[ndbd default]
NoOfReplicas= 1
MaxNoOfConcurrentTransactions= 64
MaxNoOfConcurrentOperations= CHOOSE_MaxNoOfConcurrentOperations
DataMemory= CHOOSE_DataMemory
IndexMemory= CHOOSE_IndexMemory
Diskless= CHOOSE_Diskless
TimeBetweenWatchDogCheck= 30000
DataDir= CHOOSE_FILESYSTEM
MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3

#
# Increase deadlock-timeout to cater for slow test-machines
#   (possibly running several tests in parallell)
#
#TransactionDeadlockDetectionTimeout= 7500

[ndbd]
HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress

[ndb_mgmd]
HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
DataDir= CHOOSE_FILESYSTEM    #
PortNumber= CHOOSE_PORT_MGM

[mysqld]

[mysqld]

[mysqld]

[mysqld]

[mysqld]

[mysqld]

[mysqld]

[mysqld]

--- New file ---
+++ mysql-test/ndb/ndb_config_4_node.ini	07/02/14 15:27:33
[ndbd default]
NoOfReplicas= 2
MaxNoOfConcurrentTransactions= 64
MaxNoOfConcurrentOperations= CHOOSE_MaxNoOfConcurrentOperations
DataMemory= CHOOSE_DataMemory
IndexMemory= CHOOSE_IndexMemory
Diskless= CHOOSE_Diskless
TimeBetweenWatchDogCheck= 30000
DataDir= CHOOSE_FILESYSTEM
MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3

#
# Increase deadlock-timeout to cater for slow test-machines
#   (possibly running several tests in parallell)
#
#TransactionDeadlockDetectionTimeout= 7500

[ndbd]
HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress

[ndbd]
HostName= CHOOSE_HOSTNAME_2   # hostname is a valid network adress

[ndbd]
HostName= CHOOSE_HOSTNAME_3   # hostname is a valid network adress

[ndbd]
HostName= CHOOSE_HOSTNAME_4   # hostname is a valid network adress

[ndb_mgmd]
HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
DataDir= CHOOSE_FILESYSTEM    #
PortNumber= CHOOSE_PORT_MGM

[mysqld]

[mysqld]

[mysqld]

[mysqld]

[mysqld]

[mysqld]

[mysqld]

[mysqld]