summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2013-01-20 02:39:56 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2013-01-20 02:39:56 +0000
commitfa144523881b55ebf35632d1b29c7b310c7c2494 (patch)
tree59f74e5c8ccf63b386452abcc6f1130d559cc671 /dev-db
parentBug #430836: eprefix paths in my.cnf. (diff)
downloadgentoo-2-fa144523881b55ebf35632d1b29c7b310c7c2494.tar.gz
gentoo-2-fa144523881b55ebf35632d1b29c7b310c7c2494.tar.bz2
gentoo-2-fa144523881b55ebf35632d1b29c7b310c7c2494.zip
Bug #430836: eprefix paths in my.cnf.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mariadb/ChangeLog6
-rw-r--r--dev-db/mariadb/files/my.cnf-5.154
-rw-r--r--dev-db/mariadb/files/my.cnf-5.552
3 files changed, 58 insertions, 54 deletions
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 9d91b85cb940..87de21d2b9d2 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/mariadb
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.24 2013/01/20 02:25:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.25 2013/01/20 02:39:56 robbat2 Exp $
+
+ 20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-5.1,
+ files/my.cnf-5.5:
+ Bug #430836: eprefix paths in my.cnf.
20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-5.5:
New my.cnf for 5.5 series, per eclass changes.
diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.1
index 3a4b17c93183..baf41c5b9e9d 100644
--- a/dev-db/mariadb/files/my.cnf-5.1
+++ b/dev-db/mariadb/files/my.cnf-5.1
@@ -1,66 +1,66 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.1,v 1.2 2010/03/24 18:27:39 robbat2 Exp $
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.1,v 1.3 2013/01/20 02:39:55 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
#password = your_password
port = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
[mysql]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
# use [safe_mysqld] with mysql-3
[mysqld_safe]
-err-log = /var/log/mysql/mysql.err
+err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
[mysqld]
character-set-server = utf8
user = mysql
port = 3306
-socket = /var/run/mysqld/mysqld.sock
-pid-file = /var/run/mysqld/mysqld.pid
-log-error = /var/log/mysql/mysqld.err
-basedir = /usr
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir = @GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
key_buffer = 16M
max_allowed_packet = 1M
-table_cache = 64
+table_open_cache = 64
sort_buffer_size = 512K
net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
-language = /usr/share/mysql/english
+language = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/english
# security:
# using "localhost" in connects uses sockets by default
@@ -71,15 +71,15 @@ log-bin
server-id = 1
# point the following paths to different dedicated disks
-tmpdir = /tmp/
-#log-update = /path-to-dedicated-directory/hostname
+tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
# 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
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
# this will show you *exactly* what's happening in your server ;)
-#log = /tmp/mysqld.sql
+#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
#gdb
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
@@ -100,12 +100,12 @@ 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
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
# we have to take for the moment
-#innodb_data_home_dir = /var/lib/mysql/
-#innodb_log_arch_dir = /var/lib/mysql/
-#innodb_log_group_home_dir = /var/lib/mysql/
+#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/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:max:128M
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
index ccd7b6f506d5..1f425613c592 100644
--- a/dev-db/mariadb/files/my.cnf-5.5
+++ b/dev-db/mariadb/files/my.cnf-5.5
@@ -1,55 +1,55 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.1 2013/01/20 02:25:00 robbat2 Exp $
+# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2 2013/01/20 02:39:55 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
#password = your_password
port = 3306
-socket = /var/run/mysqld/mysqld.sock
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
[mysql]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
[myisampack]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
# use [safe_mysqld] with mysql-3
[mysqld_safe]
-err-log = /var/log/mysql/mysql.err
+err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
[mysqld]
character-set-server = utf8
user = mysql
port = 3306
-socket = /var/run/mysqld/mysqld.sock
-pid-file = /var/run/mysqld/mysqld.pid
-log-error = /var/log/mysql/mysqld.err
-basedir = /usr
+socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
+pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
+log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
+basedir = @GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
key_buffer = 16M
@@ -60,7 +60,7 @@ net_buffer_length = 8K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
-lc_messages_dir = /usr/share/mysql
+lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
#Set this to your desired error message language
lc_messages = en_US
@@ -73,15 +73,15 @@ log-bin
server-id = 1
# point the following paths to different dedicated disks
-tmpdir = /tmp/
-#log-update = /path-to-dedicated-directory/hostname
+tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
+#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
# 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
+# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
# this will show you *exactly* what's happening in your server ;)
-#log = /tmp/mysqld.sql
+#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
#gdb
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
@@ -102,12 +102,12 @@ 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
+# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
# we have to take for the moment
-#innodb_data_home_dir = /var/lib/mysql/
-#innodb_log_arch_dir = /var/lib/mysql/
-#innodb_log_group_home_dir = /var/lib/mysql/
+#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
+#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/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:max:128M