New my.cnf for 5.5 series, per eclass changes.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

6 files changed, 318 insertions, 4 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 7385021df165..9d91b85cb940 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,9 @@
 # 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.23 2013/01/20 02:19:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.24 2013/01/20 02:25:00 robbat2 Exp $
+
+  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-5.5:
+  New my.cnf for 5.5 series, per eclass changes.
 
 *mariadb-5.5.28a (20 Jan 2013)
 *mariadb-5.2.13 (20 Jan 2013)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 13a01fe9e94a..82ce75e011a9 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,6 @@
 AUX my.cnf-4.1 4237 SHA256 08524ededab93a9f1678c2febf0b837bf0b46cbaf0e649a04f90746ff23e47fe SHA512 3edc4fd8214f880c4e0de51b22a28c4f984910f84abe67624282e83db11bd21469f8d3dbc022bab8daed23e09c4f4a48b26aa5b3b993edb2d699c2bcf1f5603a WHIRLPOOL a8ed9409496d96e160fb249afa56dd1ab068ee749c8621ddb056b1ac58f442192725faafbe08dae37739bfb504dcba2b1f8b8433eab665121689389c21fdb5af
 AUX my.cnf-5.1 4201 SHA256 1adcdc79da66e760bc52c71c01bf76a2ee3485096793bdfb5e22d56b9fbf6fd8 SHA512 b8cdae3299e3e51ccb508d3d1db322d5d3ee61de6301a949b5d615401b066a556443763afa23a3fdf525ca22c182a99fa0801e4899fae91dfa1e2c95262a84fd WHIRLPOOL 1d79223e1cc4bd3b4aec4665830a253c21f10a27e683720c19f138e30fea4198af49a7716832bb7b3fef3e3ebc7888ab3dbaeda4c8c29a002a950f8a112768d1
+AUX my.cnf-5.5 4378 SHA256 3455dba6c539d927bce6b5a7648f6aefb5a5467c33bd19c2f6f420af49bc5257 SHA512 90cb1b979e300f817a4a3d99741e8c4f182ee23b5fe303ecf8b91a1ced5241b13c4c382abdb8081ea9f5a93af0351d374a68eed3927f09ffc598758e310c1acc WHIRLPOOL b9a5c736578fbbe6ac7c4c601a8c085b1ae89a18d965772e9813396816d0b2728a330e2cd72b46218ad9ee5df2c31c0faa8b43778c4118c2bcc7b41c88bd4b7b
 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
@@ -22,5 +23,5 @@ EBUILD mariadb-5.3.6.ebuild 6025 SHA256 cb9840bc84fb7d804ce84ef21fdbce9b9287c627
 EBUILD mariadb-5.5.23.ebuild 5984 SHA256 e862ee8fdc6e1e7b0b93aefd20f0a411d15e7ccf7753d62bdc67f2510c21a33e SHA512 432c588c8a8cdcd07d46e1af59aad5d05346e539d23e9c453c1d0785e6496c7b12164f5591619bca10c23bb4f40614f4b1cdf6c82b92224232a65298fda9ea48 WHIRLPOOL a8f6726a103925b6ae0242eafea02584d2e4aedc94511e12a705ec9e4f1a6c7d9b1d6cb86116179b3f5179e269eca6492d42f3af37481bc71df8c2e977114c51
 EBUILD mariadb-5.5.28.ebuild 4622 SHA256 512ec89e0eb1112c84f5addbcd27427b30708ab63048450ce6a7cc522a9752ec SHA512 97a1bd0e8268b183a3183bc2c2a1477bc27f4dd20158fb0af60c57527ba2bb24e1d6e90fdb5be90e25195bd1e1e62b4d95764bd90032ea870200bf8562406349 WHIRLPOOL 3bab684c9eff93967173666d8e52af939fb4cb576a75e2b598007c53fee4853fabd2637ecb47ae165259172b363ce87dc68da44dad4bf5cb08df6f719c972cc3
 EBUILD mariadb-5.5.28a.ebuild 4670 SHA256 d041e449777e1025fb41142045d86f1197e5a6477a5752080b13311b95f1236b SHA512 978b3f8c4dc16fd0aababae50648d819651b91dc1402e1eb8bcd222d7f2e8ac20b3a7ede5bde2b67527002895dd8a4aeb7bd17dec1a7e898612891df2222f9d1 WHIRLPOOL 86be5690efc09d9ff6a3c39b9d0c4b2aa8a6ffbfe7b66773963ca079a9ec855193ce158d2c18c1e47eedcf83ca0c30161ba6e93fe666f0c6e63467e127c20a1d
-MISC ChangeLog 5198 SHA256 21a00615590c06f49ba64677a0b3211ef9457a2716c31f9b95fc61237d2927f8 SHA512 eede6936a98bf3fb42583a0562d1885b014b20a501d3c11eab4c02ead513d581ab48823d22b5877c3f710e689aad6900ebadf69d66f798edf6a28adcdd5df5a6 WHIRLPOOL d87a5bba1f6572328d17d1824dc7f038651a6e059f64cad06c84b7166ca563b8eaa0f75c052cd40341b4a1d1fbf6c4a74d1ec634548add33717b43b222129117
+MISC ChangeLog 5320 SHA256 f68404855c708fe68d76d2f55110acf2ab23e87c9fb4f687d7070c94950db705 SHA512 14f160ccde024050cccab2809e0a8277428977f01e2a1fdd962314f8a9d5dd5b0eb5b093715ad0bb80582ea5fa63550907810cbaa235ccd99f56cb913717a829 WHIRLPOOL 5bc6a176618d2777872a29c88dd216a12f62a41ce0e3b7e4455cac37714cb75e384d87bbc446f174d002315824b1930ec271489e1512c78557fcb32da598d407
 MISC metadata.xml 1566 SHA256 5c11cee8a35a2b7a2751a69e79fd3a5e3e17b7860c6f5051114dec0e270ad4d4 SHA512 526061b67c4f9fa4133ad0841f1eafe11734edc42b2f18cc526af2d8432496cfb496202cbb1003bb3610c5fbae179a081c2bd617febd9c9d3e0ca8f4afd18173 WHIRLPOOL c910bf7b3050945b2ba353d0eeda384afd07a5478225a3b39dae2803ad3192ce28584c4a5b8cacfd2af07950fc5dfdc9d81ad69a10dd0595c2165ded064439fd
diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
new file mode 100644
index 000000000000..ccd7b6f506d5
--- /dev/null
+++ b/dev-db/mariadb/files/my.cnf-5.5
@@ -0,0 +1,153 @@
+# /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 $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= /var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=/usr/share/mysql/charsets
+
+[myisampack]
+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
+[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
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+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
+lc_messages_dir			= /usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# 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
+tmpdir 						= /tmp/
+#log-update 				= /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
+# 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 directives if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# 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
+# you might want to bump this up a bit on boxes with more RAM
+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
+# 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/
+# 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
+# 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 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
+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_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index b51bca60613c..b26e7edebd06 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.632 2013/01/20 02:18:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.633 2013/01/20 02:25:08 robbat2 Exp $
+
+  20 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-5.5:
+  New my.cnf for 5.5 series, per eclass changes.
 
 *mysql-5.5.29 (20 Jan 2013)
 *mysql-5.1.67 (20 Jan 2013)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 2edf37f2a3ab..998b9a81d069 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,6 +2,7 @@ AUX my.cnf 1249 SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c
 AUX my.cnf-4.0 4324 SHA256 2c9715f29b423207a92e6bc81f1179b152c2d8ff72f69e4af3cda37c114452df SHA512 51c3956b44e54dfc3aa2f1ac0d8aac3fefca1f2a8caa9298c218eff4fd64e33f4a49ea313aafc22d13582af7420edbc35034cec1ee2340f7689cfe49b180a3d5 WHIRLPOOL 839926eb7816ef93ee1bc480b0a2fc354f91db8d3053a8679bc5663fce785a0efa974cb1421c8b6c122d5d5f86f95305eafdeadc80e2c101cced6a6017f08ec7
 AUX my.cnf-4.1 4235 SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 SHA512 8bb6a8cc05b9aea433f0a0f1184a03b5b99b6a4dd5e162abd173810db8a530de33db80a7ae0018e29879253c752a4b3a4522335a170cb2339a1ead76fd15318b WHIRLPOOL fa5e0f91100e8dd6ed42e095079635dd95ed171d96275340145136c86157805fd1d101b74b49873b6cc05f182ca209d6e981e0d16d4871adf5d24a279469b59b
 AUX my.cnf-5.1 4207 SHA256 3d1d19a8371e65e18d4e3b29010109e6730e0dac4a2eee6720fe24b7727065d0 SHA512 21f3e6781cb648435610d0139afc83f51c719667dd010d22881a06c6075b9f2cc9beecadf26057a5d4dfcb8c3c749ce6e9ad264241ca01dbcd761a7e55d0c731 WHIRLPOOL 21df22fe076d918b1e22683c4be789541267ef27e3ba9bcdccdf31bcc1b27d3ce534d6fbc1c1f1c3c562f46b5f09eb4b43facdf6c159880aa7ac28c07672c255
+AUX my.cnf-5.5 4376 SHA256 362e8d32c7a47f6433696edb897dddc0d281c4a6d4beb72042f126ca4d42d408 SHA512 01bfea0d97cc9ac5c70ddd04c48704d2ad2566538b5c53ecd4eef283a6e0451b69436bc9a95dae54031ddd6bb52e708793c6630d502de713073bacbc349b6c2f WHIRLPOOL c1474200f08da24217bc007e2e6cea8ac1c4c5604898774fd2a3bc202ee2a318dc43a6bd85e0da04787f77c0bb40f99f9ee20af8f0a084384fbec3068a418648
 AUX mysql.init 886 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 SHA512 4400e6e993fc9bb69efdb06e8dd2eaacd16a361d290031c38347a3dc1f912867bc3f0f62fe2d61e09671801a2355bf896bf22360e209e8044877ca976f4e0611 WHIRLPOOL 43a656123c687571158edc94363e9dfd742e4ef29f92551e7bba56ff9782795b75ae62fab1f659fc3d21bc6debab689c39269c0a5bfd28b6652162d38ae9dd5a
 DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab
 DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257
@@ -36,6 +37,6 @@ EBUILD mysql-5.5.22-r1.ebuild 4231 SHA256 551a745a5077cd72dd96e27ddf2c1b11f2719b
 EBUILD mysql-5.5.22.ebuild 4228 SHA256 54aeeec255369dbd3475e3daab99e73f1489df9097378848eef08711c8a9a66c SHA512 5b711f39a0fb755a787d9b9008e0b3e093cdaf88e70e92e84ccfc8774dcdb469fe958c53afd3fc1d1fbafb59028cb02f47d6bae4dcb0ab9dade37e349868892f WHIRLPOOL 89fad07ddb5f7883276c03bd7491c8fa235ecfc0c5f8c685c45e998bcf7fdc34d4a7e605b20bd4147e6a87f40a50e490bfc3645d9b329a73dc5bd30bd5686047
 EBUILD mysql-5.5.28.ebuild 4239 SHA256 6ed16f01bd369026ad624b95ab06c5bf9700b1674b1c92be7f25cb1fc05def28 SHA512 eb2bbe80519e7adf651e7c6108e95269b74b0b0595966c93b3f0d2711a33875a6ee048526d3e76177945cc962db645046e29d235b61ada46a689d292d7e8fafb WHIRLPOOL ac6b0e57ef1fb45350325e586a3a252e65eb3bbb2b661fc29fa47bdc0f94b8ec11ebb39debaefba37c35ed4986c5a09e5370bbe1a3b989e0e5d8f9e1f358dfb6
 EBUILD mysql-5.5.29.ebuild 4239 SHA256 e0698d4254ffb43527ebc76d12b032cf2bb44bb98cc84c8d35c6506e92df425e SHA512 07b378685d411bfcc9ea623f9889496ac918117db255520c772fa771af5004b834e7f2aa8d906cfbc622462c5d624fcec7150e742a1e0655fbbc90252a881d08 WHIRLPOOL ccfd8507c5e08e8151b59ad594090807c39b0eef147069fa7e9874cc5010cee796ccd1a10ccba978cfdafc5236d94c467c5ad08be42f482e6cdd74a10511eff2
-MISC ChangeLog 11991 SHA256 de7059e878b1d2f402a1fba014a0b5f529405435738642924b5a20c4a7fb7583 SHA512 35378b8895b60a1c3ab402c07da42d84fcb2ed354458d3ca20019a5405f78d07eec0e80e5addcb6b9dc993f729b52415c22fd0598f07f4c27f0be6f8ed4fe5c4 WHIRLPOOL 91b7714633daa831a4fbfd6c85654ee21992c351423f9c85c975df6553efb425afcb08f24e7911eb3cc5463487e38fc266fef2e178a9de16f52269e4fb5e84de
+MISC ChangeLog 12113 SHA256 8a2cfbcdafd92331e4e8cdcb2985cf1f223478e3c5de44d36c8adbaed1bd3c03 SHA512 36d88ee2ea3e59004cf4c8a1dfcada91d23bc136965df63d0fd9ef1f8093868185676d15e2751c452b2858b480a162f73bd3c0fef773639b325487ee4267c06a WHIRLPOOL b05f8eafe27f964fe1fbcc0ff91ce7f539c469c3e12b3f91b41cb535e56cecca7d0182357690dc6342b2e7d9e391d1eccfd5ed1c77d375e335b83e743f098a58
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1512 SHA256 2aa7aa3c625242463dcc8fbd52f0c33558507f375dd64c80412372e5d8456b70 SHA512 b9a09711b821ce7a962dcb23a4e249bfa83fd5605a45bc9416e4721a643e8fc740df4e22a7aba8d7245612361f6f3d779647f32c9469662fc2a2598030a2499e WHIRLPOOL 9d553da0a5501afbb99566ba46664f50e871e90a6ae839626f2aea9b7f28e9eadd1b8360483bed9a397082f59518009d1f70fef128399370c4bb1d6e85c2b5dd
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
new file mode 100644
index 000000000000..f2298fa97cae
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-5.5
@@ -0,0 +1,153 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.1 2013/01/20 02:25:08 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= /var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=/usr/share/mysql/charsets
+
+[myisampack]
+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
+[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
+datadir 					= @DATADIR@
+skip-external-locking
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+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
+lc_messages_dir			= /usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
+
+# 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
+tmpdir 						= /tmp/
+#log-update 				= /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
+# 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 directives if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# 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
+# you might want to bump this up a bit on boxes with more RAM
+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
+# 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/
+# 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
+# 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 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
+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_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+