- ignore-builtin-innodb is deprecated

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index a799d8f6d9327efb1ec349c94051c98f08146c00..f2df427ec7b15bc8fc0072928e0e408de2540877 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -32,6 +32,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,15 +58,13 @@ skip-networking
 
 # 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
 
@@ -184,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
@@ -207,9 +217,6 @@ innodb_log_buffer_size=1M
 #innodb_file_io_threads=4
 #innodb_lock_wait_timeout=50
 
-# http://dev.mysql.com/doc/refman/5.5/en/innodb-multiple-tablespaces.html
-#innodb_file_per_table
-
 # used for logs rotation
 [mysqladmin]
 user        = mysql_sysadmin