diff options
Diffstat (limited to 'dev-db/mysql/files/my.cnf-4.1')
| -rw-r--r-- | dev-db/mysql/files/my.cnf-4.1 | 74 |
1 files changed, 34 insertions, 40 deletions
diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1 index 39f0d3a32378..98ba864d961e 100644 --- a/dev-db/mysql/files/my.cnf-4.1 +++ b/dev-db/mysql/files/my.cnf-4.1 @@ -1,5 +1,5 @@ # /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.2 2005/07/26 17:14:23 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.3 2006/05/05 19:51:40 chtekk Exp $ # The following options will be passed to all MySQL clients [client] @@ -8,40 +8,40 @@ port = 3306 socket = /var/run/mysqld/mysqld.sock [mysql] -character-sets-dir=utf8 +character-sets-dir=/usr/share/mysql/charsets default-character-set=utf8 [mysqladmin] -character-sets-dir=utf8 +character-sets-dir=/usr/share/mysql/charsets default-character-set=utf8 [mysqlcheck] -character-sets-dir=utf8 +character-sets-dir=/usr/share/mysql/charsets default-character-set=utf8 [mysqldump] -character-sets-dir=utf8 +character-sets-dir=/usr/share/mysql/charsets default-character-set=utf8 [mysqlimport] -character-sets-dir=utf8 +character-sets-dir=/usr/share/mysql/charsets default-character-set=utf8 [mysqlshow] -character-sets-dir=utf8 +character-sets-dir=/usr/share/mysql/charsets default-character-set=utf8 [myisamchk] -character-sets-dir=utf8 +character-sets-dir=/usr/share/mysql/charsets [myisampack] -character-sets-dir=utf8 +character-sets-dir=/usr/share/mysql/charsets # use [safe_mysqld] with mysql-3 [mysqld_safe] err-log = /var/log/mysql/mysql.err -# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations. +# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations [mysqld] character-set-server = utf8 default-character-set = utf8 @@ -51,9 +51,8 @@ socket = /var/run/mysqld/mysqld.sock pid-file = /var/run/mysqld/mysqld.pid log-error = /var/log/mysql/mysqld.err basedir = /usr -datadir = /var/lib/mysql +datadir = @DATADIR@ skip-locking -#skip-innodb key_buffer = 16M max_allowed_packet = 1M table_cache = 64 @@ -64,43 +63,43 @@ read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M language = /usr/share/mysql/english -#security: -#using "localhost" in connects use sockets by default -#skip-networking +# security: +# using "localhost" in connects uses sockets by default +# skip-networking bind-address = 127.0.0.1 log-bin server-id = 1 -# Point the following paths to different dedicated disks +# point the following paths to different dedicated disks tmpdir = /tmp/ #log-update = /path-to-dedicated-directory/hostname -# you need debug use flag enabled to use this ones. -# if needed uncomment them, start the server and issue +# you need the debug USE flag enabled to use the following directives, +# if needed, uncomment them, start the server and issue # #tail -f /tmp/mysqld.sql /tmp/mysqld.trace -# this will show you *exactly* what's appening in your server ;) +# this will show you *exactly* what's happening in your server ;) #log = /tmp/mysqld.sql #gdb #debug = d:t:i:o,/tmp/mysqld.trace #one-thread -# Uncomment the following if you are using BDB tables +# uncomment the following directives if you are using BDB tables #bdb_cache_size = 4M #bdb_max_lock = 10000 -# The following is the InnoDB configuration +# the following is the InnoDB configuration # if you wish to disable innodb instead # uncomment just the next line #skip-innodb # # the rest of the innodb config follows: -# don't eat too much memory, we're trying to be safe on 64Mb boxes. +# don't eat too much memory, we're trying to be safe on 64Mb boxes # you might want to bump this up a bit on boxes with more RAM -innodb_buffer_pool_size = 16M -# this is the default, increase if you have lots of tables -innodb_additional_mem_pool_size = 2M +innodb_buffer_pool_size = 16M +# this is the default, increase it if you have lots of tables +innodb_additional_mem_pool_size = 2M # # i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( # and upstream wants things to be under /var/lib/mysql/, so that's the route @@ -110,26 +109,25 @@ innodb_additional_mem_pool_size = 2M #innodb_log_group_home_dir = /var/lib/mysql/ # you may wish to change this size to be more suitable for your system # the max is there to avoid run-away growth on your machine -innodb_data_file_path = ibdata1:10M:autoextend +innodb_data_file_path = ibdata1:10M:autoextend:max:128M # we keep this at around 25% of of innodb_buffer_pool_size # sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) -innodb_log_file_size = 5M -# this is the default, increase if you have very large transactions. -innodb_log_buffer_size = 8M -# this is the default, and won't hurt you. -# you shouldn't need to tweak it. -set-variable = innodb_log_files_in_group=2 +innodb_log_file_size = 5M +# this is the default, increase it if you have very large transactions going on +innodb_log_buffer_size = 8M +# this is the default and won't hurt you +# you shouldn't need to tweak it +set-variable = innodb_log_files_in_group=2 # see the innodb config docs, the other options are not always safe -innodb_flush_log_at_trx_commit = 1 -innodb_lock_wait_timeout = 50 - +innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 [mysqldump] quick max_allowed_packet = 16M [mysql] -# Remove the next comment character if you are not familiar with SQL +# uncomment the next directive if you are not familiar with SQL #safe-updates [isamchk] @@ -146,7 +144,3 @@ write_buffer = 2M [mysqlhotcopy] interactive-timeout - -#vim: set tabstop=4 : -#vim: set shiftwidth=4 : - |