skip duplicate default-storage-engine

[packages/percona-server.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index 11b4ae5fbef4bb57798662be0d385d63a85fafcb..4d4f2dbecad02cd2cb3a4fcef826ab86b3580403 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -22,8 +22,17 @@ user        = mysql
 #collation-server=latin2_general_ci
 #skip-character-set-client-handshake
 
-# Use passwords compatible with old 4.0 mysqld
-#old-passwords
+# This variable controls the password hashing method used by the PASSWORD()
+# function. It also influences password hashing performed by CREATE USER and
+# GRANT statements that specify a password using an IDENTIFIED BY clause.
+# http://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_old_passwords
+# Value | Password Hashing Method  | Associated Authentication Plugin
+#   0   | MySQL 4.1 native hashing | mysql_native_password
+#   1   | Pre-4.1 ("old") hashing  | mysql_old_password
+#   2   | SHA-256 hashing          | sha256_password
+# If you set old_passwords=2, follow the instructions for using the sha256_password plugin at
+# http://dev.mysql.com/doc/refman/5.6/en/sha256-authentication-plugin.html
+#old-passwords=0
 
 # Don't use system locking
 skip-external-locking
@@ -31,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.
@@ -49,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)
@@ -121,7 +128,7 @@ log-warnings = 2
 
 # Log slow queries
 slow-query-log
-slow-query-log_file = /var/log/mysql/slow.log
+slow-query-log-file = /var/log/mysql/slow.log
 
 # Log connections and queries. It slows down MySQL so it's disabled by default
 #general-log
@@ -209,12 +216,9 @@ innodb_file_per_table
 
 # these are actual defaults (as of 5.0.26)
 innodb_data_home_dir = @clusterdir@/mysqldb/db
-innodb_data_file_path = ibdata1:10M:autoextend
 innodb_mirrored_log_groups=1
 innodb_log_group_home_dir = @clusterdir@/mysqldb/db
 innodb_log_files_in_group=2
-innodb_log_file_size=5M
-innodb_log_buffer_size=1M
 
 #innodb_flush_log_at_trx_commit=1
 #innodb_log_arch_dir = @clusterdir@/innodb/log
@@ -224,12 +228,7 @@ innodb_log_buffer_size=1M
 #innodb_file_io_threads=4
 #innodb_lock_wait_timeout=50
 
-# used for logs rotation
-[mysqladmin]
+# used for logs rotation or status check for replications
+[client]
 user        = mysql_sysadmin
 password    =
-
-# used by initscript to fetch slave status
-[mysql]
-user        = mysql
-password    =