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 edadfaff23832cfed2f73acc58d6c4b2fd10e8dc..83e40c5786bf1921c2e210022967510f1ca6ceb4 100644 (file)
--- 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: