[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/files/, dev-db/mysql-cluster/files/

[gentoo-commits] proj/mysql:master commit in: dev-db/mysql/files/, dev-db/mysql-cluster/files/

[Brian Evans]

commit:     c15cf58cedfbd94d84ed41624216cd1d63079c7b
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 17:44:45 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 17:44:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c15cf58c

Sync files from portage

 dev-db/mysql-cluster/files/my.cnf-5.5            | 3 +--
 dev-db/{mysql => mysql-cluster}/files/my.cnf-5.6 | 3 +--
 dev-db/mysql/files/my.cnf-5.1                    | 3 +--
 dev-db/mysql/files/my.cnf-5.5                    | 5 ++---
 dev-db/mysql/files/my.cnf-5.6                    | 3 +--
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/dev-db/mysql-cluster/files/my.cnf-5.5 b/dev-db/mysql-cluster/files/my.cnf-5.5
index eb4f859..32d6397 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/files/my.cnf-5.5,v 1.2 2013/01/20 02:40:02 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/files/my.cnf-5.6 b/dev-db/mysql-cluster/files/my.cnf-5.6
similarity index 96%
copy from dev-db/mysql/files/my.cnf-5.6
copy to dev-db/mysql-cluster/files/my.cnf-5.6
index 17fdd7c..9fbe03e 100644
--- a/dev-db/mysql/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/mariadb/files/my.cnf-5.5,v 1.2 2013/01/20 02:39:55 robbat2 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

diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1
index f1ee4f2..65cf05c 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 eb4f859..7b2ab90 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.2 2013/01/20 02:40:02 robbat2 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
@@ -122,7 +121,7 @@ innodb_file_per_table
 
 # Uncomment this to get FEDERATED engine support
 #plugin-load=federated=ha_federated.so
-loose-federated
+#loose-federated
 
 [mysqldump]
 quick

diff --git a/dev-db/mysql/files/my.cnf-5.6 b/dev-db/mysql/files/my.cnf-5.6
index 17fdd7c..117a30b 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/mariadb/files/my.cnf-5.5,v 1.2 2013/01/20 02:39:55 robbat2 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