From: Joe Presbrey <presbrey@mit.edu>
Date: Mon, 13 Jul 2009 18:40:11 +0000 (+0000)
Subject: skip-bdb and skip-merge removed from mysqld 5.1
X-Git-Url: http://andersk.mit.edu/gitweb/sql.git/commitdiff_plain/d8e83575f1dc01df0e2c401ef216b8f86276127a

skip-bdb and skip-merge removed from mysqld 5.1

git-svn-id: svn://presbrey.mit.edu/sql@172 a142d4bd-2cfb-0310-9673-cb33a7e74f58
---

diff --git a/etc/sliced-bread/my.cnf b/etc/sliced-bread/my.cnf
index edadfaf..83e40c5 100644
--- a/etc/sliced-bread/my.cnf
+++ b/etc/sliced-bread/my.cnf
@@ -58,8 +58,6 @@ ssl_ca=/etc/pki/tls/certs/ca.pem
 ssl_cert=/etc/pki/tls/certs/sql.pem
 ssl_key=/etc/pki/tls/private/sql.pem
 
-skip-bdb
-skip-merge
 skip-name-resolve
 
 # Disable the "data directory" option: