my.cnf revert changed related to innodb

(Portage version: 2.1_pre4-r1)

4 files changed, 22 insertions, 15 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 6f8c95a29fa4..2d441c6ffaf9 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.296 2006/01/31 23:56:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.297 2006/02/01 16:35:35 vivo Exp $
+
+  01 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/my.cnf-4.1-r1:
+  my.cnf revert changed related to innodb
 
   31 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> +mysql-4.1.16.ebuild,
   +mysql-5.0.18.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b22c42ae44c4..a47a19de471d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -22,9 +22,9 @@ SHA256 1a5edc2a55a82815f79565e99189297aad0afcf37af17fdf08cdb2c6450a97a3 files/di
 MD5 61fb608f7d62d7c79a6e214ff6080464 files/digest-mysql-5.0.18 509
 RMD160 9c7c0e613946b7d4b994dd754937eaf2ac0eca6c files/digest-mysql-5.0.18 509
 SHA256 5a6cf4a50060b5e13c7bcfe4e9bb7e1596d03eaaf6871c1c33e82bddfbc17ea8 files/digest-mysql-5.0.18 509
-MD5 b780f68ac543a4a0b728d047bae97021 files/digest-mysql-5.0.18-r30 139
-RMD160 6c6bfab54b433b7047956cac9853b75530cc33df files/digest-mysql-5.0.18-r30 139
-SHA256 d48a8f159749b4ba66dbe6abda5f0e794a462d2bd28b6eb3673afd4a0f57d609 files/digest-mysql-5.0.18-r30 139
+MD5 9ea44731bd30b0dd36a7572c044696e9 files/digest-mysql-5.0.18-r30 509
+RMD160 4589dd0c639033b3de7055f6fce456381d670209 files/digest-mysql-5.0.18-r30 509
+SHA256 de83a353e7d4d66bfd5186afe2f8b461ed00d6ad7a3a47bcd8f55172cb949c5d files/digest-mysql-5.0.18-r30 509
 MD5 c97294b384ac1f53d113585d5dd4bf25 files/digest-mysql-5.1.4_alpha-r30 144
 RMD160 36f6724b42ce77631a0e78b743a6b9806cf6b8c1 files/digest-mysql-5.1.4_alpha-r30 144
 SHA256 4bbe12135832695f29d09060679739ba2ddd7bac4442bc2bae3d286275e25cbd files/digest-mysql-5.1.4_alpha-r30 144
@@ -46,9 +46,9 @@ SHA256 aafe65eb29b759c0cf19d81f3e26d95981a67662d3804454847cc4854839a34b files/my
 MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
 RMD160 28f61031229c1066e4b3122a624ea3ce050f8c39 files/my.cnf-4.1 4068
 SHA256 6d5ce7c495a09182fa57f2d148f0d76ecbaed8dfefe1804cd387713a4f7ac054 files/my.cnf-4.1 4068
-MD5 0ad942c25eb224912a699844fc15ff75 files/my.cnf-4.1-r1 4243
-RMD160 bd4488adeec4c261a2da8776687bcc6c5cc6d714 files/my.cnf-4.1-r1 4243
-SHA256 a9f8402b5b60db39cec9fb1c3072bd8d6024e4bbd4cd83ed7218a53a9a056d1e files/my.cnf-4.1-r1 4243
+MD5 2cd79a90a81537849b4b9c0b1fdc4d9b files/my.cnf-4.1-r1 4187
+RMD160 bfebfeda597bfcf0df86bb3de39d2ea7609a5f99 files/my.cnf-4.1-r1 4187
+SHA256 0739095c591a43180c25289c50ebefef95af11523bdb61be5a106b8a1522aadd files/my.cnf-4.1-r1 4187
 MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
 RMD160 f0ef64b31bcf919f4e63ba3eab679a4db9074f80 files/mysql-4.0.15.rc6 1187
 SHA256 62ed0c50ad425b856ef627f2e825841081c829fc33d57d4d34313635b7c03998 files/mysql-4.0.15.rc6 1187
diff --git a/dev-db/mysql/files/digest-mysql-5.0.18-r30 b/dev-db/mysql/files/digest-mysql-5.0.18-r30
index 347c6b065daa..a462fa2db156 100644
--- a/dev-db/mysql/files/digest-mysql-5.0.18-r30
+++ b/dev-db/mysql/files/digest-mysql-5.0.18-r30
@@ -1,2 +1,6 @@
 MD5 f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz 19169082
+RMD160 1987df6d9446637c8e353f61e269e9a57d995803 mysql-5.0.18.tar.gz 19169082
+SHA256 bd3d4b56de636eb14330be20e58f6fc58b015ff9d43926661e2e688ca7b6188a mysql-5.0.18.tar.gz 19169082
 MD5 d4e55fc358750d878ddb3c9450a95a5c mysql-extras-20060115.tar.bz2 78365
+RMD160 8ea4c995b3b3dbb7fe2f86418f0d327496ace99d mysql-extras-20060115.tar.bz2 78365
+SHA256 6a53bcd68b16de2f1990c2f523b898120f8fc32d28ad589e70452930391a6f09 mysql-extras-20060115.tar.bz2 78365
diff --git a/dev-db/mysql/files/my.cnf-4.1-r1 b/dev-db/mysql/files/my.cnf-4.1-r1
index 4b3d4692c0a4..fe74425fa5fe 100644
--- a/dev-db/mysql/files/my.cnf-4.1-r1
+++ b/dev-db/mysql/files/my.cnf-4.1-r1
@@ -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-r1,v 1.1 2006/01/24 19:25:57 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1-r1,v 1.2 2006/02/01 16:35:36 vivo Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -98,9 +98,9 @@ tmpdir 						= /tmp/
 # 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
-#GENTOO#innodb_buffer_pool_size		= 16M
+innodb_buffer_pool_size		= 16M
 # this is the default, increase if you have lots of tables
-#GENTOO#innodb_additional_mem_pool_size	= 2M
+innodb_additional_mem_pool_size	= 2M
 #
 # i'd like to use /var/lib/mysql@MY_SUFFIX@/innodb, but that is seen as a database :-(
 # and upstream wants things to be under /var/lib/mysql@MY_SUFFIX@/, so that's the route
@@ -110,18 +110,18 @@ tmpdir 						= /tmp/
 #innodb_log_group_home_dir	= /var/lib/mysql@MY_SUFFIX@/
 # 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
-#GENTOO#innodb_data_file_path		= ibdata1:10M:autoextend
+innodb_data_file_path		= ibdata1:10M:autoextend
 # 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)
-#GENTOO#innodb_log_file_size		= 5M
+innodb_log_file_size		= 5M
 # this is the default, increase if you have very large transactions.
-#GENTOO#innodb_log_buffer_size		= 8M
+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
-#GENTOO#innodb_flush_log_at_trx_commit	= 1
-#GENTOO#innodb_lock_wait_timeout	= 50
+innodb_flush_log_at_trx_commit	= 1
+innodb_lock_wait_timeout	= 50
 
 
 [mysqldump]