summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-03-15 17:31:35 +0000
committerBrian Evans <grknight@gentoo.org>2015-03-15 17:31:35 +0000
commitc4cf3b2d818802a836e754960b78cc6f9c35144e (patch)
tree9d3725a2e4b276c9a119b9b2bbb0e8a2005b099d /dev-db
parentDetect dangerous environment variables, bug 543042; support Module::Build::Ti... (diff)
downloadgentoo-2-c4cf3b2d818802a836e754960b78cc6f9c35144e.tar.gz
gentoo-2-c4cf3b2d818802a836e754960b78cc6f9c35144e.tar.bz2
gentoo-2-c4cf3b2d818802a836e754960b78cc6f9c35144e.zip
Remove commented value from the example config files that no longer exist in MySQL server
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xD1F781EFF9F4A3B6)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql/ChangeLog7
-rw-r--r--dev-db/mysql/files/my.cnf-5.13
-rw-r--r--dev-db/mysql/files/my.cnf-5.53
-rw-r--r--dev-db/mysql/files/my.cnf-5.63
4 files changed, 9 insertions, 7 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 828d5085ae31..50f06f4de32e 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-db/mysql
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.725 2015/02/19 21:51:43 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.726 2015/03/15 17:31:35 grknight Exp $
+
+ 15 Mar 2015; Brian Evans <grknight@gentoo.org> files/my.cnf-5.1,
+ files/my.cnf-5.5, files/my.cnf-5.6:
+ Remove commented value from the example config files that no longer exist in
+ MySQL server
19 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-5.6.22.ebuild:
Update stable 5.6.22 patches to include the configure fix for openssl-1.0.2
diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1
index f1ee4f23a247..65cf05c04f56 100644
--- a/dev-db/mysql/files/my.cnf-5.1
+++ b/dev-db/mysql/files/my.cnf-5.1
@@ -1,5 +1,5 @@
# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.5 2015/03/15 17:31:35 grknight Exp $
# The following options will be passed to all MySQL clients
[client]
@@ -104,7 +104,6 @@ innodb_additional_mem_pool_size = 2M
# 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 = @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
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
index b795a5d79956..7b2ab90f22a7 100644
--- a/dev-db/mysql/files/my.cnf-5.5
+++ b/dev-db/mysql/files/my.cnf-5.5
@@ -1,5 +1,5 @@
# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.4 2014/08/28 14:06:54 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.5,v 1.5 2015/03/15 17:31:35 grknight Exp $
# The following options will be passed to all MySQL clients
[client]
@@ -102,7 +102,6 @@ innodb_additional_mem_pool_size = 2M
# 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 = @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
diff --git a/dev-db/mysql/files/my.cnf-5.6 b/dev-db/mysql/files/my.cnf-5.6
index 1f37ad5e4ae6..117a30b401cf 100644
--- a/dev-db/mysql/files/my.cnf-5.6
+++ b/dev-db/mysql/files/my.cnf-5.6
@@ -1,5 +1,5 @@
# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.1 2014/10/08 16:42:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.2 2015/03/15 17:31:35 grknight Exp $
# The following options will be passed to all MySQL clients
[client]
@@ -95,7 +95,6 @@ innodb_buffer_pool_size = 128M
# 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 = @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