- ignore-builtin-innodb is deprecated

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index db3a6d8a957e0b180e73e2d36248ca15608c5e5c..f2df427ec7b15bc8fc0072928e0e408de2540877 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -23,15 +23,19 @@ user        = mysql
 #collation-server=latin2_general_ci
 #skip-character-set-client-handshake
 
-# set default charset
-#default-character-set = latin1
-
 # Use passwords compatible with old 4.0 mysqld
 #old-passwords
 
 # Don't use system locking
 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.
@@ -46,20 +50,21 @@ 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
+#default-storage-engine=MyISAM
+
 # skip startup of slave
 #skip-slave-start
 
 # slave setup
 #relay-log=slave-relay-bin
-#master-host=master
-#master-user=replica
-#master-port=3306
-#master-password=replica
 #report-host=db-slave.example.org
 
 # master does not ignore them, but we do
 #replicate-ignore-db=mysql
 #replicate-ignore-db=test
+#replicate-ignore-table=db1.tbl1
+#replicate-ignore-table=db2.tbl2
 
 #replicate-rewrite-db=delfi->delfi_ro
 
@@ -95,6 +100,9 @@ skip-networking
 #binlog-ignore-db=mysql
 #binlog-ignore-db=test
 
+# global option where logs be written
+log-output = FILE
+
 # mysqld error log (stderr)
 log-error = /var/log/mysql/mysqld.log
 log-warnings = 2
@@ -102,7 +110,6 @@ log-warnings = 2
 # Log slow queries
 slow-query-log
 slow-query-log_file = /var/log/mysql/slow.log
-log-output = FILE
 
 # Log connections and queries. It slows down MySQL so it's disabled by default
 #general-log
@@ -114,7 +121,7 @@ log-output = FILE
 #log-long-format
 
 # Language
-#language   = polish
+#lc-messages = pl_PL
 
 # Path for temporary files. Several paths may be specified, separated by a
 # colon (:), in this case they are used in a round-robin fashion.
@@ -179,12 +186,20 @@ myisam-recover
 #myisam_sort_buffer_size=4M
 
 
+# To completely disable InnoDB, use this option
+# this makes all innodb options being unknown options (including skip-innodb)
+# @deprecated
+#ignore-builtin-innodb
 
 #
 # InnoDB tables options (see MySQL manual)
 #
 #skip-innodb
 
+# 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
+
 # these are actual defaults (as of 5.0.26)
 innodb_data_home_dir = @clusterdir@/mysqldb/db
 innodb_data_file_path = ibdata1:10M:autoextend