X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=mysqld.conf;h=c9da04de6779faa41945bc75a57661dedc86d4ea;hb=25cd076701ac95ccd5c8100704bd53b868e6f4b7;hp=c4f7331dfd3099d2af088f45e118d3108d2810a3;hpb=bfeeb8ad08433b4da25106914f8cb1f1810bedf5;p=packages%2Fmysql.git

diff --git a/mysqld.conf b/mysqld.conf
index c4f7331..c9da04d 100644
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -3,7 +3,6 @@
 #
 # One can use all long options that the mysqld supports.
 # Run mysqld with --help to get a whole list of available options
-# $Id$
 
 # This section must be the first!
 [mysqld]
@@ -23,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
@@ -32,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.
@@ -50,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)
@@ -106,7 +112,14 @@ skip-networking
 # replication local log
 #max_relay_log_size=256M
 
+# https://dev.mysql.com/doc/refman/5.6/en/log-destinations.html
 # global option where logs be written
+# affects slow-query-log, general-log direcives
+# Possible values: FILE, TABLE
+# NOTE: when using table, you can switch to MyISAM, but the contents is still
+# not replicated, also mysqldump will not dump data, only create table
+# statements
+#log-output = TABLE
 log-output = FILE
 
 # mysqld error log (stderr)
@@ -115,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
@@ -137,6 +150,7 @@ slow-query-log_file = /var/log/mysql/slow.log
 # Internal server variables
 #
 
+explicit_defaults_for_timestamp = true
 #back_log=5
 #connect_timeout=5
 #delayed_insert_timeout=300
@@ -164,8 +178,8 @@ slow-query-log_file = /var/log/mysql/slow.log
 #max_heap_table_size=32M
 #thread_cache_size=16
 #thread_stack=65536
-# Try number of CPU's*2
-#thread_concurrency=8
+# http://www.mysqlperformanceblog.com/2012/06/04/thread_concurrency-doesnt-do-what-you-expect/
+# thread_concurrency is deprecated, removed in 5.6.1 and works on old Solaris versions < 9
 #wait_timeout=28800
 #query_cache_size=8M
 #query_cache_limit=1M
@@ -173,6 +187,10 @@ slow-query-log_file = /var/log/mysql/slow.log
 # Fulltext search options
 #ft_min_word_len=2
 
+# Turn off nonstandard TIMESTAMP behaviors
+# http://dev.mysql.com/doc/refman/5.6/en/server-system-variables.html#sysvar_explicit_defaults_for_timestamp
+explicit_defaults_for_timestamp = true
+
 #
 # MyISAM tables options
 #
@@ -182,7 +200,8 @@ slow-query-log_file = /var/log/mysql/slow.log
 #delay-key-write-for-all-tables
 
 # Repair automatically on open if the table wasn't closed properly.
-myisam-recover
+# http://dev.mysql.com/doc/refman/5.6/en/server-options.html#option_mysqld_myisam-recover-options
+myisam-recover-options
 #
 #myisam_sort_buffer_size=4M
 
@@ -199,12 +218,11 @@ myisam-recover
 
 # http://stackoverflow.com/questions/2646373/mysql-data-file-wont-shrink
 # http://dev.mysql.com/doc/refman/5.5/en/innodb-multiple-tablespaces.html
-#innodb_file_per_table
+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
@@ -218,12 +236,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    =