diff options
author | Timothy Smith <timothy.smith@sun.com> | 2008-07-19 02:31:33 -0600 |
---|---|---|
committer | Timothy Smith <timothy.smith@sun.com> | 2008-07-19 02:31:33 -0600 |
commit | 9e6621b861a5d0f80ddafeb53c7e329d70c3b50d (patch) | |
tree | ba25ec15ec3d0dc46d425780e1b3dc233ec8a882 /support-files/my-medium.cnf.sh | |
parent | 92ba017b2cc56651c3653cc10d4681c446f82912 (diff) | |
parent | 100d417ec2bc3315c27ee2c532b85dc00541e109 (diff) | |
download | mariadb-git-9e6621b861a5d0f80ddafeb53c7e329d70c3b50d.tar.gz |
Up-merge of merges, some criss-cross resolved with --weave.
Diffstat (limited to 'support-files/my-medium.cnf.sh')
-rw-r--r-- | support-files/my-medium.cnf.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index 4a7bfcfc775..10d3e74f619 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 |