bk commit into 5.1 tree (jmiller:1.2663)

[jmiller]

Below is the list of changes that have just been committed into a local
5.1 repository of jmiller.  When jmiller 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, 2008-01-23 20:45:46+01:00, jmiller@stripped +4 -0
  config.medium.ini.sh, config.small.ini.sh, config.huge.ini.sh:
    Sample cluster configuration files for 5.1
  Makefile.am:
    Updated for new files

  support-files/Makefile.am@stripped, 2008-01-23 20:45:36+01:00, jmiller@stripped +6 -0
    Updated for new files

  support-files/config.huge.ini.sh@stripped, 2008-01-23 20:45:07+01:00, jmiller@stripped +212
-0
    Sample cluster configuration files for 5.1

  support-files/config.huge.ini.sh@stripped, 2008-01-23 20:45:07+01:00, jmiller@stripped +0 -0

  support-files/config.medium.ini.sh@stripped, 2008-01-23 20:45:07+01:00, jmiller@stripped
+124 -0
    Sample cluster configuration files for 5.1

  support-files/config.medium.ini.sh@stripped, 2008-01-23 20:45:07+01:00, jmiller@stripped +0
-0

  support-files/config.small.ini.sh@stripped, 2008-01-23 20:45:07+01:00, jmiller@stripped +65
-0
    Sample cluster configuration files for 5.1

  support-files/config.small.ini.sh@stripped, 2008-01-23 20:45:07+01:00, jmiller@stripped +0
-0

diff -Nrup a/support-files/Makefile.am b/support-files/Makefile.am
--- a/support-files/Makefile.am	2007-09-26 20:18:00 +02:00
+++ b/support-files/Makefile.am	2008-01-23 20:45:36 +01:00
@@ -26,6 +26,9 @@ EXTRA_DIST =		mysql.spec.sh \
 			mysql-log-rotate.sh \
 			mysql.server.sh \
 			mysqld_multi.server.sh \
+                        config.huge.ini.sh \
+                        config.medium.ini.sh \
+                        config.small.ini.sh \
 			binary-configure.sh \
 			magic mysql.m4 \
 			MySQL-shared-compat.spec.sh \
@@ -41,6 +44,9 @@ pkgsupp_DATA =		my-small.cnf \
 			my-medium.cnf \
 			my-large.cnf \
 			my-huge.cnf \
+                        config.huge.ini \
+                        config.medium.ini \
+                        config.small.ini \
 			my-innodb-heavy-4G.cnf \
 			mysql-log-rotate \
 			binary-configure \
diff -Nrup a/support-files/config.huge.ini.sh b/support-files/config.huge.ini.sh
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/support-files/config.huge.ini.sh	2008-01-23 20:45:07 +01:00
@@ -0,0 +1,212 @@
+######################################################
+# MySQL NDB Cluster Huge Sample Configuration File   #
+######################################################
+# This files assumes that you are using at least 9   #
+# hosts for running the cluster. Hostnames and paths #
+# listed below should be changed to match your setup #
+######################################################
+
+[NDBD DEFAULT]
+NoOfReplicas: 2
+DataDir: /add/path/here
+FileSystemPath: /add/path/here
+
+# Data Memory, Index Memory, and String Memory #
+DataMemory: 6000M
+IndexMemory: 1500M
+StringMemory: 5
+
+# Transaction Parameters #
+MaxNoOfConcurrentTransactions: 4096
+MaxNoOfConcurrentOperations: 100000
+MaxNoOfLocalOperations: 100000
+
+# Transaction Temporary Storage #
+MaxNoOfConcurrentIndexOperations: 8192
+MaxNoOfFiredTriggers: 4000
+TransactionBufferMemory: 1M
+
+# Scans and buffering #
+MaxNoOfConcurrentScans: 300
+MaxNoOfLocalScans: 32
+BatchSizePerLocalScan: 64
+LongMessageBuffer: 1M
+
+# Logging and Checkpointing #
+NoOfFragmentLogFiles: 300
+FragmentLogFileSize: 16M
+MaxNoOfOpenFiles: 40
+InitialNoOfOpenFiles: 27
+MaxNoOfSavedMessages: 25
+
+# Metadata Objects #
+MaxNoOfAttributes: 1500
+MaxNoOfTables: 400
+MaxNoOfOrderedIndexes: 200
+MaxNoOfUniqueHashIndexes: 200
+MaxNoOfTriggers: 770
+
+# Boolean Parameters #
+LockPagesInMainMemory: 0
+StopOnError: 1
+Diskless: 0
+ODirect: 0
+
+# Controlling Timeouts, Intervals, and Disk Paging #
+TimeBetweenWatchDogCheck: 6000
+TimeBetweenWatchDogCheckInitial: 6000
+StartPartialTimeout: 30000
+StartPartitionedTimeout: 60000
+StartFailureTimeout: 1000000
+HeartbeatIntervalDbDb: 2000
+HeartbeatIntervalDbApi: 3000
+TimeBetweenLocalCheckpoints: 20
+TimeBetweenGlobalCheckpoints: 2000
+TransactionInactiveTimeout: 0
+TransactionDeadlockDetectionTimeout: 1200
+DiskSyncSize: 4M
+DiskCheckpointSpeed: 10M
+DiskCheckpointSpeedInRestart: 100M
+ArbitrationTimeout: 10
+
+# Buffering and Logging #
+UndoIndexBuffer: 2M
+UndoDataBuffer: 1M
+RedoBuffer: 32M
+LogLevelStartup: 15
+LogLevelShutdown: 3
+LogLevelStatistic: 0
+LogLevelCheckpoint: 0
+LogLevelNodeRestart: 0
+LogLevelConnection: 0
+LogLevelError: 15
+LogLevelCongestion: 0
+LogLevelInfo: 3
+MemReportFrequency: 0
+
+# Backup Parameters #
+BackupDataBufferSize: 2M
+BackupLogBufferSize: 2M
+BackupMemory: 64M
+BackupWriteSize: 32K
+BackupMaxWriteSize: 256K
+
+[MGM DEFAULT]
+PortNumber: 1186
+DataDir: /add/path/here
+
+[TCP DEFAULT]
+SendBufferMemory: 2M
+
+#######################################
+# Change HOST1 to the name of the NDB_MGMD host
+# Change HOST2 to the name of the NDB_MGMD host
+# Change HOST3 to the name of the NDB_MGMD host
+# Change HOST4 to the name of the NDBD host
+# Change HOST5 to the name of the NDBD host
+# Change HOST6 to the name of the NDBD host
+# Change HOST7 to the name of the NDBD host
+# Change HOST8 to the name of the NDBD host
+# Change HOST9 to the name of the NDBD host
+#######################################
+
+[NDB_MGMD]
+Id: 1
+HostName: HOST1
+ArbitrationRank: 1
+
+[NDB_MGMD]
+Id: 2
+HostName: HOST2
+ArbitrationRank: 1
+
+[NDB_MGMD]
+Id: 3
+HostName: HOST3
+ArbitrationRank: 1
+
+[NDBD]
+Id: 4
+HostName: HOST4
+
+[NDBD]
+Id: 5
+HostName: HOST5
+
+[NDBD]
+Id: 6
+HostName: HOST6
+
+[NDBD]
+Id: 7
+HostName: HOST7
+
+[NDBD]
+Id: 8
+HostName: HOST8
+
+[NDBD]
+Id: 9
+HostName: HOST9
+
+######################################################
+# Note: The following can be MySQLD connections or   #
+#      NDB API application connecting to the cluster #
+######################################################
+
+[API]
+Id: 10
+HostName: HOST1
+ArbitrationRank: 2
+
+[API]
+Id: 11
+HostName: HOST2
+ArbitrationRank: 2
+
+[API]
+Id: 12
+HostName: HOST3
+
+[API]
+Id: 13
+HostName: HOST4
+
+[API]
+Id: 14
+HostName: HOST5
+
+[API]
+Id: 15
+HostName: HOST6
+
+[API]
+Id: 16
+HostName: HOST7
+
+[API]
+Id: 17
+HostName: HOST8
+
+[API]
+Id: 19
+HostName: HOST9
+
+[API]
+Id: 20
+
+[API]
+Id: 21
+
+[API]
+Id: 22
+
+[API]
+Id: 23
+
+[API]
+Id: 24
+
+[API]
+Id: 25
+
diff -Nrup a/support-files/config.medium.ini.sh b/support-files/config.medium.ini.sh
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/support-files/config.medium.ini.sh	2008-01-23 20:45:07 +01:00
@@ -0,0 +1,124 @@
+#
+# MySQL NDB Cluster Medium Sample Configuration File
+#
+# This files assumes that you are using at least 6
+# hosts for running the cluster. Hostnames and paths
+# listed below should be changed to match your setup
+#
+
+[NDBD DEFAULT]
+NoOfReplicas: 2
+DataDir: /add/path/here
+FileSystemPath: /add/path/here
+
+
+# Data Memory, Index Memory, and String Memory
+
+DataMemory: 3000M
+IndexMemory: 800M
+BackupMemory: 64M
+
+# Transaction Parameters
+
+MaxNoOfConcurrentOperations: 100000
+MaxNoOfLocalOperations: 100000
+
+# Buffering and Logging
+
+RedoBuffer: 16M
+
+# Logging and Checkpointing
+
+NoOfFragmentLogFiles: 200
+
+# Metadata Objects
+
+MaxNoOfAttributes: 500
+MaxNoOfTables: 100
+
+# Scans and Buffering
+
+MaxNoOfConcurrentScans: 100
+
+
+[MGM DEFAULT]
+PortNumber: 1186
+DataDir: /add/path/here
+
+#
+# Change HOST1 to the name of the NDB_MGMD host
+# Change HOST2 to the name of the NDB_MGMD host
+# Change HOST3 to the name of the NDBD host
+# Change HOST4 to the name of the NDBD host
+# Change HOST5 to the name of the NDBD host
+# Change HOST6 to the name of the NDBD host
+#
+
+[NDB_MGMD]
+Id: 1
+HostName: HOST1
+ArbitrationRank: 1
+
+[NDB_MGMD]
+Id: 2
+HostName: HOST2
+ArbitrationRank: 1
+
+[NDBD]
+Id: 3
+HostName: HOST3
+
+[NDBD]
+Id: 4
+HostName: HOST4
+
+[NDBD]
+Id: 5
+HostName: HOST5
+
+[NDBD]
+Id: 6
+HostName: HOST6
+
+#
+# Note: The following can be MySQLD connections or
+#      NDB API application connecting to the cluster
+#
+
+[API]
+Id: 7
+HostName: HOST1
+ArbitrationRank: 2
+
+[API]
+Id: 8
+HostName: HOST2
+ArbitrationRank: 2
+
+[API]
+Id: 9
+HostName: HOST3
+ArbitrationRank: 2
+
+[API]
+Id: 10
+HostName: HOST4
+
+[API]
+Id: 11
+HostName: HOST5
+
+[API]
+Id: 12
+HostName: HOST6
+
+[API]
+Id: 13
+
+[API]
+Id: 14
+
+[API]
+Id: 15
+
+
diff -Nrup a/support-files/config.small.ini.sh b/support-files/config.small.ini.sh
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/support-files/config.small.ini.sh	2008-01-23 20:45:07 +01:00
@@ -0,0 +1,65 @@
+#
+# MySQL NDB Cluster Small Sample Configuration File
+#
+# This files assumes that you are using 1 to 3 hosts
+# for running the cluster. Hostnames and paths listed
+# below should be changed to match your setup.
+#
+# Note: You can change localhost for a different host
+#
+
+[NDBD DEFAULT]
+NoOfReplicas: 2
+DataDir: /add/path/here
+FileSystemPath: /add/path/here
+
+# Data Memory, Index Memory, and String Memory
+
+DataMemory: 600M
+IndexMemory: 100M
+BackupMemory: 64M
+
+[MGM DEFAULT]
+PortNumber: 1186
+DataDir: /add/path/here
+
+[NDB_MGMD]
+Id: 1
+HostName: localhost
+ArbitrationRank: 1
+
+[NDBD]
+Id: 2
+HostName: localhost
+
+[NDBD]
+Id: 3
+HostName: localhost
+
+#
+# Note: The following can be MySQLD connections or
+#      NDB API application connecting to the cluster
+#
+
+[API]
+Id: 4
+HostName: localhost
+ArbitrationRank: 2
+
+[API]
+Id: 5
+HostName: localhost
+
+[API]
+Id: 6
+HostName: localhost
+
+[API]
+Id: 7
+
+[API]
+Id: 8
+
+[API]
+Id: 9
+