commit: 698bdbf873dd486f56b09d9352a446f7ec5f2581
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 8 14:57:54 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 8 14:57:54 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=698bdbf8
Use 5.6 defaults in a new file wrt bug 524768
---
.../my.cnf-5.5 => mariadb-galera/files/my.cnf-5.6} | 38 ++++++++++++++--------
.../files/my.cnf-5.5 => mariadb/files/my.cnf-5.6} | 22 +++++--------
.../files/my.cnf-5.5 => mysql/files/my.cnf-5.6} | 22 ++++---------
.../files/{my.cnf-5.5 => my.cnf-5.6} | 22 ++++---------
eclass/mysql-cmake.eclass | 3 +-
5 files changed, 48 insertions(+), 59 deletions(-)
diff --git a/dev-db/percona-server/files/my.cnf-5.5
b/dev-db/mariadb-galera/files/my.cnf-5.6
similarity index 83%
copy from dev-db/percona-server/files/my.cnf-5.5
copy to dev-db/mariadb-galera/files/my.cnf-5.6
index 85a26ec..9da84ad 100644
--- a/dev-db/percona-server/files/my.cnf-5.5
+++ b/dev-db/mariadb-galera/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.5,v 1.2
2013/01/20 02:40:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2
2013/01/20 02:39:55 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
@@ -53,10 +53,10 @@ basedir =
@GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
+max_allowed_packet = 4M
+table_open_cache = 400
sort_buffer_size = 512K
-net_buffer_length = 8K
+net_buffer_length = 16K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
@@ -77,7 +77,7 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#log-update =
@GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue
+# if needed, uncomment them, start the server and issue
# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
# this will show you *exactly* what's happening in your server ;)
@@ -86,17 +86,10 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
# the rest of the innodb config follows:
# don't eat too much memory, we're trying to be safe on 64Mb boxes
# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
+innodb_buffer_pool_size = 128M
#
# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is
seen as a database :-(
# and upstream wants things to be under
@GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
@@ -109,7 +102,7 @@ innodb_additional_mem_pool_size = 2M
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
# we keep this at around 25% of of innodb_buffer_pool_size
# sensible values range from 1MB to
(1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
+innodb_log_file_size = 48M
# this is the default, increase it if you have very large transactions going on
innodb_log_buffer_size = 8M
# this is the default and won't hurt you
@@ -124,6 +117,22 @@ innodb_file_per_table
#plugin-load=federated=ha_federated.so
loose-federated
+# These settings are required for Galera clustering
+#mysql settings
+binlog_format=ROW
+default-storage-engine=innodb
+innodb_autoinc_lock_mode=2
+query_cache_size=0
+query_cache_type=0
+bind-address=0.0.0.0
+# Uncomment this section to activate Galera clustering
+#wsrep_provider=@GENTOO_PORTAGE_EPREFIX@/usr/lib/galera/libgalera_smm.so
+# You should change this name to something meaningful
+#wsrep_cluster_name="my_wsrep_cluster"
+# List all nodes of the cluster including this one
+#wsrep_cluster_address="gcomm://172.16.8.5,172.16.8.6,172.16.8.4"
+#wsrep_sst_method=rsync
+
[mysqldump]
quick
max_allowed_packet = 16M
@@ -147,3 +156,4 @@ write_buffer_size = 2M
[mysqlhotcopy]
interactive-timeout
+[mariadb]
diff --git a/dev-db/percona-server/files/my.cnf-5.5
b/dev-db/mariadb/files/my.cnf-5.6
similarity index 89%
copy from dev-db/percona-server/files/my.cnf-5.5
copy to dev-db/mariadb/files/my.cnf-5.6
index 85a26ec..3820910 100644
--- a/dev-db/percona-server/files/my.cnf-5.5
+++ b/dev-db/mariadb/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.5,v 1.2
2013/01/20 02:40:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2
2013/01/20 02:39:55 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
@@ -53,10 +53,10 @@ basedir =
@GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
+max_allowed_packet = 4M
+table_open_cache = 400
sort_buffer_size = 512K
-net_buffer_length = 8K
+net_buffer_length = 16K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
@@ -77,7 +77,7 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#log-update =
@GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue
+# if needed, uncomment them, start the server and issue
# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
# this will show you *exactly* what's happening in your server ;)
@@ -86,17 +86,10 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
# the rest of the innodb config follows:
# don't eat too much memory, we're trying to be safe on 64Mb boxes
# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
+innodb_buffer_pool_size = 128M
#
# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is
seen as a database :-(
# and upstream wants things to be under
@GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
@@ -109,7 +102,7 @@ innodb_additional_mem_pool_size = 2M
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
# we keep this at around 25% of of innodb_buffer_pool_size
# sensible values range from 1MB to
(1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
+innodb_log_file_size = 48M
# this is the default, increase it if you have very large transactions going on
innodb_log_buffer_size = 8M
# this is the default and won't hurt you
@@ -147,3 +140,4 @@ write_buffer_size = 2M
[mysqlhotcopy]
interactive-timeout
+[mariadb]
diff --git a/dev-db/percona-server/files/my.cnf-5.5
b/dev-db/mysql/files/my.cnf-5.6
similarity index 89%
copy from dev-db/percona-server/files/my.cnf-5.5
copy to dev-db/mysql/files/my.cnf-5.6
index 85a26ec..17fdd7c 100644
--- a/dev-db/percona-server/files/my.cnf-5.5
+++ 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.5,v 1.2
2013/01/20 02:40:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2
2013/01/20 02:39:55 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
@@ -53,10 +53,10 @@ basedir =
@GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
+max_allowed_packet = 4M
+table_open_cache = 400
sort_buffer_size = 512K
-net_buffer_length = 8K
+net_buffer_length = 16K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
@@ -77,7 +77,7 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#log-update =
@GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue
+# if needed, uncomment them, start the server and issue
# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
# this will show you *exactly* what's happening in your server ;)
@@ -86,17 +86,10 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
# the rest of the innodb config follows:
# don't eat too much memory, we're trying to be safe on 64Mb boxes
# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
+innodb_buffer_pool_size = 128M
#
# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is
seen as a database :-(
# and upstream wants things to be under
@GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
@@ -109,7 +102,7 @@ innodb_additional_mem_pool_size = 2M
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
# we keep this at around 25% of of innodb_buffer_pool_size
# sensible values range from 1MB to
(1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
+innodb_log_file_size = 48M
# this is the default, increase it if you have very large transactions going on
innodb_log_buffer_size = 8M
# this is the default and won't hurt you
@@ -146,4 +139,3 @@ write_buffer_size = 2M
[mysqlhotcopy]
interactive-timeout
-
diff --git a/dev-db/percona-server/files/my.cnf-5.5
b/dev-db/percona-server/files/my.cnf-5.6
similarity index 89%
rename from dev-db/percona-server/files/my.cnf-5.5
rename to dev-db/percona-server/files/my.cnf-5.6
index 85a26ec..17fdd7c 100644
--- a/dev-db/percona-server/files/my.cnf-5.5
+++ b/dev-db/percona-server/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.5,v 1.2
2013/01/20 02:40:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.5,v 1.2
2013/01/20 02:39:55 robbat2 Exp $
# The following options will be passed to all MySQL clients
[client]
@@ -53,10 +53,10 @@ basedir =
@GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
+max_allowed_packet = 4M
+table_open_cache = 400
sort_buffer_size = 512K
-net_buffer_length = 8K
+net_buffer_length = 16K
read_buffer_size = 256K
read_rnd_buffer_size = 512K
myisam_sort_buffer_size = 8M
@@ -77,7 +77,7 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#log-update =
@GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue
+# if needed, uncomment them, start the server and issue
# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
# this will show you *exactly* what's happening in your server ;)
@@ -86,17 +86,10 @@ tmpdir =
@GENTOO_PORTAGE_EPREFIX@/tmp/
#debug = d:t:i:o,/tmp/mysqld.trace
#one-thread
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
# the rest of the innodb config follows:
# don't eat too much memory, we're trying to be safe on 64Mb boxes
# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
+innodb_buffer_pool_size = 128M
#
# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is
seen as a database :-(
# and upstream wants things to be under
@GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
@@ -109,7 +102,7 @@ innodb_additional_mem_pool_size = 2M
innodb_data_file_path = ibdata1:10M:autoextend:max:128M
# we keep this at around 25% of of innodb_buffer_pool_size
# sensible values range from 1MB to
(1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
+innodb_log_file_size = 48M
# this is the default, increase it if you have very large transactions going on
innodb_log_buffer_size = 8M
# this is the default and won't hurt you
@@ -146,4 +139,3 @@ write_buffer_size = 2M
[mysqlhotcopy]
interactive-timeout
-
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 286fe04..da35b2e 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -415,7 +415,8 @@ mysql-cmake_src_install() {
# Configuration stuff
case ${MYSQL_PV_MAJOR} in
5.[1-4]*) mysql_mycnf_version="5.1" ;;
- 5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;;
+ 5.5) mysql_mycnf_version="5.5" ;;
+ 5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;;
esac
einfo "Building default my.cnf (${mysql_mycnf_version})"
insinto "${MY_SYSCONFDIR#${EPREFIX}}"
