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

diff --git a/mysqld.conf b/mysqld.conf
index c9da04d..658fb6d 100644
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -40,6 +40,10 @@ 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.
@@ -54,9 +58,7 @@ skip-networking
 # Emergency option. Use only if you really need this.
 #skip-grant-tables
 
-# 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
+# http://dev.mysql.com/doc/refman/5.5/en/server-options.html#option_mysqld_default-storage-engine
 #default-storage-engine=MyISAM
 
 # Replication Master Server (default)
@@ -124,7 +126,7 @@ log-output = FILE
 
 # mysqld error log (stderr)
 log-error = /var/log/mysql/mysqld.log
-log-warnings = 2
+log-error-verbosity = 2
 
 # Log slow queries
 slow-query-log
@@ -150,7 +152,6 @@ 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
@@ -187,10 +188,6 @@ explicit_defaults_for_timestamp = true
 # 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
 #
@@ -200,11 +197,10 @@ explicit_defaults_for_timestamp = true
 #delay-key-write-for-all-tables
 
 # Repair automatically on open if the table wasn't closed properly.
-# http://dev.mysql.com/doc/refman/5.6/en/server-options.html#option_mysqld_myisam-recover-options
+# http://dev.mysql.com/doc/refman/5.7/en/server-options.html#option_mysqld_myisam-recover-options
 myisam-recover-options
-#
-#myisam_sort_buffer_size=4M
 
+#myisam_sort_buffer_size=4M
 
 # To completely disable InnoDB, use this option
 # this makes all innodb options being unknown options (including skip-innodb)
@@ -222,11 +218,8 @@ 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_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