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 | 6e8eaa8e21074c37363881a1b1607d8497dafbe6 (patch) | |
| tree | ba25ec15ec3d0dc46d425780e1b3dc233ec8a882 /support-files/my-large.cnf.sh | |
| parent | e6f3e65a3a25604700bd8b119182e994eb0134fb (diff) | |
| parent | f44c3210cec4e7274e39bab464f9277887cad867 (diff) | |
| download | mariadb-git-6e8eaa8e21074c37363881a1b1607d8497dafbe6.tar.gz | |
Up-merge of merges, some criss-cross resolved with --weave.
Diffstat (limited to 'support-files/my-large.cnf.sh')
| -rw-r--r-- | support-files/my-large.cnf.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index 6fa4c21f96b..2e3143ac449 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 |