summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorJonathan Perkin <jperkin@sun.com>2008-06-10 21:10:56 +0200
committermysqldev <mysqldev@production.mysql.com>2008-06-10 21:10:56 +0200
commitb32fce091fcf36779962ccefa51c00466d4126c1 (patch)
treeb2508b67e411fbe2e9fece37e21ec7a4134d58ec /support-files
parentda4cfa6d1ec4e02247a41fe3af068ffd042e23be (diff)
downloadmariadb-git-b32fce091fcf36779962ccefa51c00466d4126c1.tar.gz
Use skip-federated by default in all example configs.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/my-huge.cnf.sh3
-rw-r--r--support-files/my-innodb-heavy-4G.cnf.sh3
-rw-r--r--support-files/my-large.cnf.sh3
-rw-r--r--support-files/my-medium.cnf.sh3
-rw-r--r--support-files/my-small.cnf.sh3
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