summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2015-03-15 17:37:42 +0000
committerBrian Evans <grknight@gentoo.org>2015-03-15 17:37:42 +0000
commit5be945ee75837ff76cdfccfdcc33e7160b532b9c (patch)
tree14326a42a619c1aa0279b7363f2b701ba189ef50 /dev-db/mysql-cluster
parentAdd conditional bindist restriction and remove bindist USE flag, bug 541592. (diff)
downloadgentoo-2-5be945ee75837ff76cdfccfdcc33e7160b532b9c.tar.gz
gentoo-2-5be945ee75837ff76cdfccfdcc33e7160b532b9c.tar.bz2
gentoo-2-5be945ee75837ff76cdfccfdcc33e7160b532b9c.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/mysql-cluster')
-rw-r--r--dev-db/mysql-cluster/ChangeLog7
-rw-r--r--dev-db/mysql-cluster/files/my.cnf-5.53
-rw-r--r--dev-db/mysql-cluster/files/my.cnf-5.63
3 files changed, 8 insertions, 5 deletions
diff --git a/dev-db/mysql-cluster/ChangeLog b/dev-db/mysql-cluster/ChangeLog
index d3a55377bb68..1bb2980f97b0 100644
--- a/dev-db/mysql-cluster/ChangeLog
+++ b/dev-db/mysql-cluster/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-db/mysql-cluster
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/ChangeLog,v 1.8 2015/02/16 17:33:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/ChangeLog,v 1.9 2015/03/15 17:37:42 grknight Exp $
+
+ 15 Mar 2015; Brian Evans <grknight@gentoo.org> 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
16 Feb 2015; Brian Evans <grknight@gentoo.org> +files/my.cnf-5.6:
Add in configuration file for 7.3
diff --git a/dev-db/mysql-cluster/files/my.cnf-5.5 b/dev-db/mysql-cluster/files/my.cnf-5.5
index 0e0838be51d8..32d63975b320 100644
--- a/dev-db/mysql-cluster/files/my.cnf-5.5
+++ b/dev-db/mysql-cluster/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-cluster/files/my.cnf-5.5,v 1.1 2014/08/03 21:42:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/files/my.cnf-5.5,v 1.2 2015/03/15 17:37:42 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-cluster/files/my.cnf-5.6 b/dev-db/mysql-cluster/files/my.cnf-5.6
index fe3848508314..9fbe03e6a985 100644
--- a/dev-db/mysql-cluster/files/my.cnf-5.6
+++ b/dev-db/mysql-cluster/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-cluster/files/my.cnf-5.6,v 1.1 2015/02/16 17:33:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/files/my.cnf-5.6,v 1.2 2015/03/15 17:37:42 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