- rel 2; patches updated

[packages/mysql.git] / mysqld.conf

diff --git a/mysqld.conf b/mysqld.conf
index c9484cbdd764426308619a5b03fa93996b280737..b83fd3f3c0f330acbec174da441b83aad9b79181 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -46,6 +46,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
+#default-storage-engine=MyISAM
+
 # skip startup of slave
 #skip-slave-start
 
@@ -187,6 +190,10 @@ myisam-recover
 #
 #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
@@ -204,9 +211,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