diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
| commit | a4e7283a9254c09057c92ec20fc145c52bea1d51 (patch) | |
| tree | 6009880c2c51b3422d95a760220fb7a20ebdb3e0 /support-files | |
| parent | c425bf421da9ffa55d3d568f70508fa12dd07aa0 (diff) | |
| parent | 55ab1ef6951428e0be31956e152537dec670e7df (diff) | |
| download | mariadb-git-a4e7283a9254c09057c92ec20fc145c52bea1d51.tar.gz | |
Merge from 5.0 trunk.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/my-huge.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-innodb-heavy-4G.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-medium.cnf.sh | 3 | ||||
| -rw-r--r-- | support-files/my-small.cnf.sh | 3 |
5 files changed, 15 insertions, 0 deletions
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 5dc3e5a1900..e4747ac4564 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -46,6 +46,9 @@ thread_concurrency = 8 # #skip-networking +# Disable Federated by default +skip-federated + # Replication Master Server (default) # binary logging is required for replication log-bin=mysql-bin diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh index 77c6cea56d5..cda11d661bc 100644 --- a/support-files/my-innodb-heavy-4G.cnf.sh +++ b/support-files/my-innodb-heavy-4G.cnf.sh @@ -357,6 +357,9 @@ myisam_repair_threads = 1 myisam_recover +# Disable Federated by default +skip-federated + # *** BDB Specific options *** # Use this option if you run a MySQL server with BDB support enabled but diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index 4dc3f929c48..981b13731e4 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -46,6 +46,9 @@ thread_concurrency = 8 # #skip-networking +# Disable Federated by default +skip-federated + # Replication Master Server (default) # binary logging is required for replication log-bin=mysql-bin diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index 99b6e823f39..c3135ea2c2b 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -44,6 +44,9 @@ myisam_sort_buffer_size = 8M # #skip-networking +# Disable Federated by default +skip-federated + # Replication Master Server (default) # binary logging is required for replication log-bin=mysql-bin diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index 288df893b4c..cf2ebed463c 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -48,6 +48,9 @@ server-id = 1 # Uncomment the following if you want to log updates #log-bin=mysql-bin +# Disable Federated by default +skip-federated + # Uncomment the following if you are NOT using BDB tables #skip-bdb |