summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-02-02 03:12:03 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-02-02 03:12:03 +0000
commit04d1b13efd19acfee45bcd7e0795657acc1b1961 (patch)
tree71ff30d227a3bca30e2d16e84e47fc7c2e3c0474 /dev-db/mysql
parentRestore copyright dates. (diff)
downloadhistorical-04d1b13efd19acfee45bcd7e0795657acc1b1961.tar.gz
historical-04d1b13efd19acfee45bcd7e0795657acc1b1961.tar.bz2
historical-04d1b13efd19acfee45bcd7e0795657acc1b1961.zip
Bug #360847: Give users of MySQL 4.0 an easier time in upgrading on a newer config.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'dev-db/mysql')
-rw-r--r--dev-db/mysql/ChangeLog6
-rw-r--r--dev-db/mysql/Manifest4
-rw-r--r--dev-db/mysql/files/my.cnf-4.04
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 396591dc1e0e..404648ada29e 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/mysql
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.597 2012/01/31 20:23:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.598 2012/02/02 03:12:03 robbat2 Exp $
+
+ 02 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-4.0:
+ Bug #360847: Give users of MySQL 4.0 an easier time in upgrading on a newer
+ config.
31 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.61.ebuild:
Bug #401673: False positive on federated.federated_plugin test with
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 49ecc06a9cee..27b13033ee4c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,5 @@
AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
-AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
+AUX my.cnf-4.0 4324 RMD160 dbf65ae929107c374994e39364af6f3515a9aa45 SHA1 0ec588cfd977b513eb11c3563f89042563ebce21 SHA256 2c9715f29b423207a92e6bc81f1179b152c2d8ff72f69e4af3cda37c114452df
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7
AUX my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec7307911cef SHA1 5845dcaf469bd95d918cc07b1ffc80e2bd4c5a68 SHA256 c50e38004c901d4921d00a5f458bcd191852262a93f3d9fbfb6b040186b1ec45
AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12
@@ -45,6 +45,6 @@ EBUILD mysql-5.1.59.ebuild 8735 RMD160 6c6414519d83c587e0cd9d784f2421d8aefde9be
EBUILD mysql-5.1.61.ebuild 8888 RMD160 418f097cc87e03c678872dd95ecdc2b44a2140b2 SHA1 abfaf4fa5bb10551db7b742e792e0f6c2d118c88 SHA256 0ea0d451bdd94314896fa8dbe167e38a37aafc7462807c6ede137c5b5e938708
EBUILD mysql-5.5.19.ebuild 4234 RMD160 ab95178bb615cfdf73d6085b424c2127e45640e0 SHA1 d5ec9a7dde6788c6cb1a189f45d02e532ce5861c SHA256 b178e2dbcb0afb843b53cf2c0148dfc52a1909141435d43fd32d4e4dfee94e3a
EBUILD mysql-5.5.20.ebuild 4230 RMD160 83ff016f9baa86b9d39501c8bd7dda9069f9b2db SHA1 2d666a87cd4c4723c9e4882702504def6498781d SHA256 bd74a5f69a5c8ec88fb25ec9aa1dd61875d299412392b6b7581d8133f64b054e
-MISC ChangeLog 6666 RMD160 d78956aacc090055cfb45e7ded511d5649820eba SHA1 0bbc20745cbb97fdc0cf96ad8a852fac4b75f533 SHA256 2bf21ad77a84b5ef1bc7e17f6eb6ff93bd2647e0abc45b15472d79aedb50da4d
+MISC ChangeLog 6826 RMD160 f1be920d641105ad22a1372e10bc7234c5c5215c SHA1 8b83be0425740a8a1871214e5d9bfa0d5a8a17f6 SHA256 2e7f1ef1d062bc4d2967e8af6a62758ed28bae5c7a95af48f40a9101fa7942fe
MISC ChangeLog-2010 108404 RMD160 11fd27413d19e453f2cfe1877c93f53d06c81f82 SHA1 4722e0f32417772921ab328942a7dcbd743b3c56 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd
MISC metadata.xml 1497 RMD160 82a73ef66a72224add24244ddf39df290a1f67dc SHA1 3a1fd203707ee79ea61202e559b8e912653ffbff SHA256 dde83b854d83894cffd06d26a28ed66e7a0788ba70a745ece4ff719445cc9bf1
diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0
index 305f7c92cc13..abc86905298e 100644
--- a/dev-db/mysql/files/my.cnf-4.0
+++ b/dev-db/mysql/files/my.cnf-4.0
@@ -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.0,v 1.2 2008/11/14 02:16:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.3 2012/02/02 03:12:02 robbat2 Exp $
#
# This file can be simultaneously placed in three places:
# 1. /etc/mysql/my.cnf to set global options.
@@ -100,7 +100,7 @@ set-variable = innodb_log_buffer_size=1M
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_file_per_table
+loose-innodb_file_per_table=1
[mysqldump]
quick