[packages/percona-server/test-merge: 13/14] skip duplicate default-storage-engine

[glen]

commit ef0e4cb41a4bb6383703be0874f69c004827739c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Apr 12 09:05:03 2016 +0300

    skip duplicate default-storage-engine

 mysqld.conf | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/mysqld.conf b/mysqld.conf
index 6320c07..3e717ad 100644
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -40,10 +40,6 @@ skip-external-locking
 # Disabling symbolic-links is recommended to prevent assorted security risks
 symbolic-links=0
 
-# Default storage engine is InnoDB since 5.5.5
-# You may revert to previous behaviour by specifiying MyISAM here
-#default-storage-engine=InnoDB
-
 # Don't listen on a TCP/IP port at all. This is a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.
 # All interaction with mysqld must be made via Unix sockets.
@@ -58,7 +54,9 @@ skip-networking
 # Emergency option. Use only if you really need this.
 #skip-grant-tables
 
-# http://dev.mysql.com/doc/refman/5.5/en/server-options.html#option_mysqld_default-storage-engine
+# http://dev.mysql.com/doc/refman/5.6/en/server-options.html#option_mysqld_default-storage-engine
+# Default storage engine is InnoDB since 5.5.5
+# You may revert to previous behaviour by specifiying MyISAM here
 #default-storage-engine=MyISAM
 
 # Replication Master Server (default)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/3f9db001d66dea8ecc4912a033a20aa9bae752b7