saving uncommitted changes in /etc prior to emerge run

diff --git a/config-archive/etc/mysql/my.cnf b/config-archive/etc/mysql/my.cnf
index 70a500e898c7c8e0844e5973965987dd9ac5e897..f20db312e78ad98715fb9cbdd5fa491188aadbb0 100644 (file)
--- a/config-archive/etc/mysql/my.cnf
+++ b/config-archive/etc/mysql/my.cnf
@@ -101,6 +101,7 @@ innodb_additional_mem_pool_size = 2M
 # and upstream wants things to be under /var/lib/mysql/, so that's the route
 # we have to take for the moment
 #innodb_data_home_dir          = /var/lib/mysql/
+#innodb_log_arch_dir           = /var/lib/mysql/
 #innodb_log_group_home_dir     = /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
@@ -144,3 +145,5 @@ write_buffer_size                   = 2M
 
 [mysqlhotcopy]
 interactive-timeout
+
+[mariadb]

diff --git a/config-archive/etc/mysql/my.cnf.1 b/config-archive/etc/mysql/my.cnf.1
index 19c0e3256dda47250c6d3839d05385c24834ebe0..70a500e898c7c8e0844e5973965987dd9ac5e897 100644 (file)
--- a/config-archive/etc/mysql/my.cnf.1
+++ b/config-archive/etc/mysql/my.cnf.1
@@ -1,5 +1,5 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.6,v 1.2 2015/03/15 17:31:35 grknight Exp $
+# $Id$
 
 # The following options will be passed to all MySQL clients
 [client]

diff --git a/config-archive/etc/mysql/my.cnf.2 b/config-archive/etc/mysql/my.cnf.2
index e199b260753778272ee91bb1234fb881035c2844..19c0e3256dda47250c6d3839d05385c24834ebe0 100644 (file)
--- a/config-archive/etc/mysql/my.cnf.2
+++ b/config-archive/etc/mysql/my.cnf.2
@@ -1,5 +1,5 @@
 # /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]
@@ -101,7 +101,6 @@ innodb_additional_mem_pool_size = 2M
 # and upstream wants things to be under /var/lib/mysql/, so that's the route
 # we have to take for the moment
 #innodb_data_home_dir          = /var/lib/mysql/
-#innodb_log_arch_dir           = /var/lib/mysql/
 #innodb_log_group_home_dir     = /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/config-archive/etc/mysql/my.cnf.3 b/config-archive/etc/mysql/my.cnf.3
index 3303d7e6b2bf592ec594ccb0fae82eb0621d7ac4..e199b260753778272ee91bb1234fb881035c2844 100644 (file)
--- a/config-archive/etc/mysql/my.cnf.3
+++ b/config-archive/etc/mysql/my.cnf.3
@@ -1,5 +1,5 @@
 # /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.6,v 1.1 2014/10/08 16:42:41 grknight Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -59,7 +59,7 @@ max_allowed_packet                    = 1M
 table_cache                            = 64
 table_open_cache                       = 64
 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
@@ -81,7 +81,7 @@ tmpdir                                                = /tmp/
 #log-update                            = /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 /tmp/mysqld.sql /tmp/mysqld.trace
 # this will show you *exactly* what's happening in your server ;)
 
@@ -90,11 +90,6 @@ tmpdir                                               = /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
@@ -150,4 +145,3 @@ write_buffer_size                   = 2M
 
 [mysqlhotcopy]
 interactive-timeout
-

diff --git a/config-archive/etc/mysql/my.cnf.4 b/config-archive/etc/mysql/my.cnf.4
index e054133eb5030012de30e963b0a5408668de0e8b..3303d7e6b2bf592ec594ccb0fae82eb0621d7ac4 100644 (file)
--- a/config-archive/etc/mysql/my.cnf.4
+++ b/config-archive/etc/mysql/my.cnf.4
@@ -1,5 +1,5 @@
 # /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.5,v 1.4 2014/08/28 14:06:54 grknight Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -52,10 +52,9 @@ socket                                               = /var/run/mysqld/mysqld.sock
 pid-file                                       = /var/run/mysqld/mysqld.pid
 log-error                                      = /var/log/mysql/mysqld.err
 basedir                                        = /usr
-#datadir                                       = /var/lib/mysql
 datadir                                        = /data/mysql
 skip-external-locking
-key_buffer                                     = 16M
+key_buffer_size                                        = 16M
 max_allowed_packet                     = 1M
 table_cache                            = 64
 table_open_cache                       = 64
@@ -64,7 +63,10 @@ net_buffer_length                    = 8K
 read_buffer_size                       = 256K
 read_rnd_buffer_size           = 512K
 myisam_sort_buffer_size        = 8M
-language                                       = /usr/share/mysql/german
+lc_messages_dir                        = /usr/share/mysql
+#Set this to your desired error message language
+#lc_messages                   = en_US
+lc_messages                    = de_DE
 
 # security:
 # using "localhost" in connects uses sockets by default
@@ -88,10 +90,6 @@ tmpdir                                               = /tmp/
 #debug                                         = d:t:i:o,/tmp/mysqld.trace
 #one-thread
 
-# uncomment the following directives if you are using BDB tables
-#bdb_cache_size                                = 4M
-#bdb_max_lock                          = 10000
-
 # the following is the InnoDB configuration
 # if you wish to disable innodb instead
 # uncomment just the next line
@@ -126,6 +124,10 @@ innodb_flush_log_at_trx_commit = 1
 innodb_lock_wait_timeout = 50
 innodb_file_per_table
 
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+#loose-federated
+
 [mysqldump]
 quick
 max_allowed_packet                     = 16M
@@ -135,16 +137,17 @@ max_allowed_packet                        = 16M
 #safe-updates
 
 [isamchk]
-key_buffer                                     = 20M
+key_buffer_size                                = 20M
 sort_buffer_size                       = 20M
 read_buffer                            = 2M
 write_buffer                           = 2M
 
 [myisamchk]
-key_buffer                                     = 20M
+key_buffer_size                                = 20M
 sort_buffer_size                       = 20M
-read_buffer                            = 2M
-write_buffer                           = 2M
+read_buffer_size                       = 2M
+write_buffer_size                      = 2M
 
 [mysqlhotcopy]
 interactive-timeout
+

diff --git a/config-archive/etc/mysql/my.cnf.5 b/config-archive/etc/mysql/my.cnf.5
index 775dce06d959bb275e8e314022485962649da1a3..e054133eb5030012de30e963b0a5408668de0e8b 100644 (file)
--- a/config-archive/etc/mysql/my.cnf.5
+++ b/config-archive/etc/mysql/my.cnf.5
@@ -1,5 +1,5 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $
 
 # The following options will be passed to all MySQL clients
 [client]

diff --git a/config-archive/etc/mysql/my.cnf.6 b/config-archive/etc/mysql/my.cnf.6
index b324ed2cfabf6915bbca7b1ac1c1c04271744bfa..775dce06d959bb275e8e314022485962649da1a3 100644 (file)
--- a/config-archive/etc/mysql/my.cnf.6
+++ b/config-archive/etc/mysql/my.cnf.6
@@ -1,5 +1,5 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.3 2012/02/15 02:07:21 jmbsvicetto Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -58,6 +58,7 @@ skip-external-locking
 key_buffer                                     = 16M
 max_allowed_packet                     = 1M
 table_cache                            = 64
+table_open_cache                       = 64
 sort_buffer_size                       = 512K
 net_buffer_length                      = 8K
 read_buffer_size                       = 256K

diff --git a/config-archive/etc/mysql/my.cnf.7 b/config-archive/etc/mysql/my.cnf.7
new file mode 100644 (file)
index 0000000..b324ed2
--- /dev/null
+++ b/config-archive/etc/mysql/my.cnf.7
@@ -0,0 +1,149 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:09 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password                                      = your_password
+port                                           = 3306
+socket                                         = /var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+prompt                                          = MySQL \u@\h:\d >\_
+
+[mysqladmin]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log                                                = /var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server           = utf8
+default-character-set          = utf8
+user                                           = mysql
+port                                           = 3306
+socket                                                 = /var/run/mysqld/mysqld.sock
+pid-file                                       = /var/run/mysqld/mysqld.pid
+log-error                                      = /var/log/mysql/mysqld.err
+basedir                                        = /usr
+#datadir                                       = /var/lib/mysql
+datadir                                        = /data/mysql
+skip-external-locking
+key_buffer                                     = 16M
+max_allowed_packet                     = 1M
+table_cache                            = 64
+sort_buffer_size                       = 512K
+net_buffer_length                      = 8K
+read_buffer_size                       = 256K
+read_rnd_buffer_size           = 512K
+myisam_sort_buffer_size        = 8M
+language                                       = /usr/share/mysql/german
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+#bind-address                          = 127.0.0.1
+
+log-bin
+server-id                                      = 1
+
+# point the following paths to different dedicated disks
+tmpdir                                                 = /tmp/
+#log-update                            = /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 
+# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log                                           = /tmp/mysqld.sql
+#gdb
+#debug                                         = d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# uncomment the following directives if you are using BDB tables
+#bdb_cache_size                                = 4M
+#bdb_max_lock                          = 10000
+
+# 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
+#
+# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir          = /var/lib/mysql/
+#innodb_log_arch_dir           = /var/lib/mysql/
+#innodb_log_group_home_dir     = /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
+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
+# 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
+# you shouldn't need to tweak it
+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_lock_wait_timeout = 50
+innodb_file_per_table
+
+[mysqldump]
+quick
+max_allowed_packet                     = 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer                                     = 20M
+sort_buffer_size                       = 20M
+read_buffer                            = 2M
+write_buffer                           = 2M
+
+[myisamchk]
+key_buffer                                     = 20M
+sort_buffer_size                       = 20M
+read_buffer                            = 2M
+write_buffer                           = 2M
+
+[mysqlhotcopy]
+interactive-timeout

diff --git a/config-archive/etc/mysql/my.cnf.dist b/config-archive/etc/mysql/my.cnf.dist
index 78846103e984343b0550e961043dff404a48d4fb..87d5bae85f854bb14df1fc9c87d788fc19fcf96d 100644 (file)
--- a/config-archive/etc/mysql/my.cnf.dist
+++ b/config-archive/etc/mysql/my.cnf.dist
@@ -1,5 +1,4 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Id$
 
 # The following options will be passed to all MySQL clients
 [client]

diff --git a/mysql/my.cnf b/mysql/my.cnf
index f20db312e78ad98715fb9cbdd5fa491188aadbb0..e33f5f23f6643717059ac706814b02a7b0b3859e 100644 (file)
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -1,5 +1,4 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Id$
 
 # The following options will be passed to all MySQL clients
 [client]