summaryrefslogtreecommitdiff
path: root/dev-db
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
commit6e43588d78fb7cb95aaf9754a25ca8e1588cab7d (patch)
tree3369fdb2200c7ed91b6c70031582809afd75cd50 /dev-db
parentRestore copyright dates. (diff)
downloadgentoo-2-6e43588d78fb7cb95aaf9754a25ca8e1588cab7d.tar.gz
gentoo-2-6e43588d78fb7cb95aaf9754a25ca8e1588cab7d.tar.bz2
gentoo-2-6e43588d78fb7cb95aaf9754a25ca8e1588cab7d.zip
Bug #360847: Give users of MySQL 4.0 an easier time in upgrading on a newer config.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql/ChangeLog6
-rw-r--r--dev-db/mysql/files/my.cnf-4.04
2 files changed, 7 insertions, 3 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/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