- relocated default datadir to /var/lib/mysql/db

- added InnoDB and BDB options

Changed files:
    mysqld.conf -> 1.4

diff --git a/mysqld.conf b/mysqld.conf
index 9772b5da6e5f926f9bb9048f7667429be4b477fa..ec9bbd935dc3716bc8c6774530092e7a054ca270 100644 (file)
--- a/mysqld.conf
+++ b/mysqld.conf
@@ -5,7 +5,7 @@
 
 # This section must be the first!
 [mysqld] 
-datadir     = /var/lib/mysql
+datadir     = /var/lib/mysql/db
 pid-file    = /var/lib/mysql/mysql.pid
 port        = 3306
 socket      = /var/lib/mysql/mysql.sock
@@ -31,18 +31,9 @@ skip-networking
 # Language
 #language   = polish
 
-
+#
 # Internal server variables
-
-# MyISAM (MySQL >= 3.23.x) options
-# Don't flush key buffers between writes for any MyISAM
-# delay-key-write-for-all-tables
-
-# repair automatically on open if the table wasn't closed properly.
-# myisam-recover
-# 
-# set-variable = myisam_sort_buffer_size=4M
-
+#
 
 #set-variable = back_log=5
 #set-variable = connect_timeout=5
@@ -69,6 +60,68 @@ skip-networking
 #set-variable = wait_timeout=28800
 
 
+
+#
+# MyISAM tables options
+#
+
+# Don't flush key buffers between writes for any MyISAM
+#delay-key-write-for-all-tables
+
+# Repair automatically on open if the table wasn't closed properly.
+myisam-recover
+# 
+#set-variable = myisam_sort_buffer_size=4M
+
+
+
+#
+# InnoDB tables options (see MySQL manual) 
+#
+
+#innodb_data_home_dir = /var/lib/mysql/innodb/data
+#innodb_data_file_path = 00:10M;01:20M
+#set-variable = innodb_mirrored_log_groups=1
+#innodb_log_group_home_dir = /var/lib/mysql/innodb/log
+#set-variable = innodb_log_files_in_group=3
+#set-variable = innodb_log_file_size=30M
+#set-variable = innodb_log_buffer_size=8M
+
+#innodb_flush_log_at_trx_commit=1
+#innodb_log_arch_dir = /var/lib/mysql/innodb/log
+#innodb_log_archive=0
+#set-variable = innodb_buffer_pool_size=80M
+#set-variable = innodb_additional_mem_pool_size=10M
+#set-variable = innodb_file_io_threads=4
+#set-variable = innodb_lock_wait_timeout=50
+
+
+#
+# Berkeley DB tables options
+#
+# Don't use berkeley db (saves a lot of memory)
+#skip-bdb
+
+#bdb-home          =  /var/lib/mysql/db 
+#bdb-log-dir       =  /var/lib/mysql/bdb/log
+#bdb-tmpdir        =  /var/lib/mysql/bdb/tmp
+
+
+#bdb-lock-detect   =  DEFAULT
+
+# Don't synchronously flush logs.
+#bdb-no-sync 
+
+# Don't start Berkeley DB in recover mode.
+#bdb-no-recover
+
+# Start Berkeley DB in multi-process mode (Don't use `DB_PRIVATE' 
+# when initializing Berkeley DB
+#bdb-shared-data
+
+#set-variable      = bdb_max_lock=1000 
+
+
 # used for logs rotation
 [mysqladmin]
 user        = mysql_logrotate