summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2013-01-28 02:17:24 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2013-01-28 02:17:24 +0000
commitd4883499d7b1a2ca43cc731d90a10bf2a8a40734 (patch)
tree2745f4a2145992839e448b4e0a8540a4fc29fb25 /dev-db/mariadb
parentSync from gentoo-x86. (diff)
downloadmysql-d4883499d7b1a2ca43cc731d90a10bf2a8a40734.tar.gz
mysql-d4883499d7b1a2ca43cc731d90a10bf2a8a40734.tar.bz2
mysql-d4883499d7b1a2ca43cc731d90a10bf2a8a40734.zip
Sync with gentoo-x86 for prefix changes.
Package-Manager: portage-2.2.0_alpha159 RepoMan-Options: --force
Diffstat (limited to 'dev-db/mariadb')
-rw-r--r--dev-db/mariadb/ChangeLog4
-rw-r--r--dev-db/mariadb/Manifest10
-rw-r--r--dev-db/mariadb/files/my.cnf-4.12
-rw-r--r--dev-db/mariadb/files/my.cnf-5.156
-rw-r--r--dev-db/mariadb/files/my.cnf-5.552
5 files changed, 57 insertions, 67 deletions
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index db2b024..6dd3e06 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.1,
+ files/my.cnf-5.1, files/my.cnf-5.5:
+ Sync with gentoo-x86 for prefix changes.
+
20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.62-r1.ebuild,
mariadb-5.1.62.ebuild, mariadb-5.1.66.ebuild, mariadb-5.2.12-r1.ebuild,
mariadb-5.2.12.ebuild, mariadb-5.2.13.ebuild, mariadb-5.3.11.ebuild,
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index f9d2b6e..6448e31 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,16 +1,6 @@
-DIST mariadb-5.1.62.tar.gz 24931609 SHA256 2293e973d22bc969dcb8b17710c909182d2b7960f711b124c0c9f429f9dd11da SHA512 a579e7fb9421a7de1a77881575c35d43bfaa2cdfc398477f80373fad4faec0bcc7bea3248cd67972787745744653dbf0c27b226d79dccbc4ffe77bab7dda0c35 WHIRLPOOL 5e8207c5344309a7263570cbd6beca438b4287024ff48aedf33465327d81b2360977fe8da44d1f49500e6c3181e6dea664eb425b73185bbc0c10d3ed55c57e72
DIST mariadb-5.1.66.tar.gz 25017546 SHA256 c11d8e4f6bfcdea8833470a33738e0561da97dd3c63575de2b959008509ae372 SHA512 603e8f571e2446f7596776769633dcf5496f4fdea100c43222efcc74b9c8ed292a0c2944c43f7c216fd2676b59ee18bdbb5d6f38f27627551252ff25d722dce6 WHIRLPOOL 9043e5a0215773f8f7cb8b5265101f019caeb5f73bc5cc3ea2b37a67500fc149395201611cd87c3e131b562a9ad9cdd5672bc6c545cd8e71da983a4a7b6ef737
-DIST mariadb-5.2.12.tar.gz 25364319 SHA256 6d53bc0831d87b695cc872c3456c16935aed67250fb305cdb7197274e2632a49 SHA512 d4583e0f6b8ae5b90e6c2818ecb98eadd5245e1c2c1a270980dc7b002c62f056fe0c15a389548d6e0ec3c0d83ac72a9fe30b6f9b220c92eae0e0ca29fd7bb333 WHIRLPOOL 10cdec3090f733110c762daae945f6a77f61103f3c14ccf38884df41b036497c360d98cc3be3c754563f8a0affb6ad012224f2f31905b709eb34a61e0613bf90
DIST mariadb-5.2.13.tar.gz 25459987 SHA256 96887416e097f1d4a7dde70ad404e6b7d26d3d13b5d1a8451e1ea62cdd9b0ca8 SHA512 696bb5f59f25fa31fc35399c99f6f13e37a178b1e9b0155e3cf053b1232a950035132d075b0594ff611f6b59635d49d0800820c2bbd02932d16917e174717f8a WHIRLPOOL 6755eb6a841350eb69668a1679b1cb7ec3d6ac58bb793b07d07353cc1962a82c111920dc7bc8b08056a85beb7f8d371045fdeb31751a44981f7b910d52e3da74
DIST mariadb-5.3.11.tar.gz 26865690 SHA256 07a766b007c2f2c50680ccde121801208222877bb9311ffc9abf85e2f5e09f3a SHA512 8f501c6c4c3c886ff65c079ebba8e4870ebf8e6b451f35014b6d7cd4f74bf5c23360c271b5ef759b10a491914136213d759b859b1df9ba06d9863d684aa8d8e9 WHIRLPOOL 4b74bc8e4606a5c14e437a57398091d717bd866e179e26ced8054f3b5c6e88548f8e15e9a822f39ff5e81c6d6f90d7d69c5a42549bf81c2eb57f5b0d448ca2c0
-DIST mariadb-5.3.6.tar.gz 26724631 SHA256 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040 SHA512 ccf61f42084318a9084f742bdf03786b6590b0969b42c17c05503fac9608a56e39ee1a0ad0276aea413c61822cf5edfddcf25bfe9d421d76e01824332b7fee67 WHIRLPOOL cf5887291affd437f755e63d2c79e3fcc63fa5687dfab8c069b62caced59ced2cdae2a54e560e54a1435ec52c5a21ea19efe081704d98de104fc3c8688713b85
-DIST mariadb-5.3.7.tar.gz 26741196 SHA256 463386ca84128a162e63137c8f6666859b94e2abf490b6ab2306f846a13fe9bc SHA512 08eefd9eabedf4b6097b2fcc6d7a853e9b3b7c262d02fb3aaa37f0f241b98368ca4b052cc8a47ab7fc45714a28720edd203e7f2c9227d6af2a36de7f1274fe6a WHIRLPOOL d4364585e2db4c4d7e823d22468aac21343f0f6d051533372c24c914f4b03939f6f98128872b80169d53aeb7ce4d1f4e42f6fbf38fb9baf6b240c58d7ee17cff
-DIST mariadb-5.3.9.tar.gz 26806579 SHA256 4b9db3fd4ccdd8dd9f93c3f12fdb14e5523bbb08f563d29acfb919b66f804423 SHA512 dd87ad072f1b9242c76a35a1f827921ca0291a3b4009e4d29439f9e471d90b285a0b26ab5d1078505d31def91adf9c64cf8a22f56df2d4a04668ce952ae77914 WHIRLPOOL e8a346d5c44bd13978f7a30ee2b9ce782806f4043f9e020bac4a8427c9bbc8339f5e70b78ad64b4fadafe70e3130f996662bf7641df68fc063106774c696a47f
-DIST mariadb-5.5.24.tar.gz 27438507 SHA256 ced8d6b851ad0047d6654520c784f1bcfc3afa986f154ddb798041d1ebf9118b
-DIST mariadb-5.5.25.tar.gz 27488554 SHA256 40de17d2a54e1bd6da55144054c170b330d8e5281b236939238ff3574404bddb SHA512 4d937a1534b2b81de5c8e0f93a6d8b0928bf18277ed54b966a49c741262f6a01eecdd5bafc8fa2fa2869ae23eea5f06496d1ee5494c943641dc4121d7f239116 WHIRLPOOL 93a3199a145c34b1198d677eb8596547a9019170adad8efa1cbad923debe5098b386f5aafecff8211990175ac0f7e8f70483ff98eb5ac6e2d5a2b48bce2f129d
-DIST mariadb-5.5.28.tar.gz 27819467 SHA256 1237568d36fcbda707d363f2819ac539aedf2f49267162ec95e90cf4bb049850 SHA512 8ee9c624da4683ba4145f15014780568c4ea2034204d4f80e0aad688cdfe41cba49d3ca6db7adf52023054a5b7f467ab11d62a5fe30e0d5e92dff491dc8e5e5e WHIRLPOOL 879683cae962d8d15d0913d21df05570b01d24e7c5e9ece3c4ce8e23324005a044122d16a7e683ce43637bed796c93fa05c17e516ddf4e59f0662705be244b6c
DIST mariadb-5.5.28a.tar.gz 27844298 SHA256 66c908592763c641f2a1e9fd83f080458a0d3375cda9aaf7700a37877b1e9968 SHA512 49fbbffb68f77e370cb288f7e406389101dd85433f2bbf25f9932d5e22ad6647b5a5f7fa397fa2f2efb5b7f2d860f395224d3188b70ed474373b820b1e708df7 WHIRLPOOL 3575a808b5bd0cf3778fcc81c78a4999abdb0cf82a577ebc4cda77df8db8c54120108d086c598ed40ae9eeb8660874cc8f33f6de2380a2a6fcb5ea70d0a1c727
-DIST mysql-extras-20120416-2021Z.tar.bz2 1874771 SHA256 af780a9c41a5073d7a66e991e9b1c468bea89b1efd7fbea7e6daa5f75d235e33 SHA512 c1a33fb4875274ee5c04182b62697037454f3aea26e094003e985b9c3c0d47a8dd62a572e4db95ce98d6dbfba4388ae1f2577378acc15b4d3ad0b762e3cecb1d WHIRLPOOL bc3b2018fab6ab93bfbf834a99061c95a511415fd25bea988a27108fcd210142791983d1f5a561961e471a7b2e99210e4b260a200d85150bac596cdb6e1a83d5
-DIST mysql-extras-20120906-1344Z.tar.bz2 1898342 SHA256 75e8efa38d6b10b63d05553f5c884396bdd50b9a445731892dc7780d0a015b2e SHA512 4c253a5772eea4e130c39b4e127372431afaf53d574f8369e905c636c7c12e7eb534432e1ffd681eb83de857850ddcba161ef5c489e1f077ff850bf95978d4f8 WHIRLPOOL 1e9bd9f1ce83d219c20e089e952a8b39c73d97d027a1309788a3d8e529d5444412d6e4445d362b16e01c9ea918cc7c994635c240ca7f7848a2c06f528d832485
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e
diff --git a/dev-db/mariadb/files/my.cnf-4.1 b/dev-db/mariadb/files/my.cnf-4.1
index 458a58a..211deaa 100644
--- a/dev-db/mariadb/files/my.cnf-4.1
+++ b/dev-db/mariadb/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.4 2008/11/14 02:16:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-4.1,v 1.1 2010/03/15 18:47:39 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.1
index e5738e6..baf41c5 100644
--- a/dev-db/mariadb/files/my.cnf-5.1
+++ b/dev-db/mariadb/files/my.cnf-5.1
@@ -1,55 +1,55 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 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
@@ -60,7 +60,7 @@ 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
@@ -122,10 +122,6 @@ innodb_flush_log_at_trx_commit = 1
innodb_lock_wait_timeout = 50
innodb_file_per_table
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
[mysqldump]
quick
max_allowed_packet = 16M
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
index 90b17b2..1f42561 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: $
+# @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