public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/, eclass/, dev-db/mysql/files/
Date: Sun, 20 Jan 2013 02:15:03 +0000 (UTC)	[thread overview]
Message-ID: <1354037399.2e5fd44e2aa390f0712913961723b2ae51540cc0.robbat2@gentoo> (raw)

commit:     2e5fd44e2aa390f0712913961723b2ae51540cc0
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Aug  8 15:28:50 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 17:29:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=2e5fd44e

Configuration files update to remove errors.
Create new 5.5 files for the deprecated language variable that throws errors on startup.
120808 10:59:03 [ERROR] An old style --language value with language specific part detected: /usr/share/mysql/english/
120808 10:59:03 [ERROR] Use --lc-messages-dir without language specific part instead.
Copy the mysql 5.1 file to mariadb 5.1 which was using some wrong variables on the client end.

---
 dev-db/mariadb/files/my.cnf-5.1                    |   20 +++++++++------
 dev-db/mariadb/files/{my.cnf-5.1 => my.cnf-5.5}    |   25 ++++++++++++-------
 .../files/my.cnf-5.1 => mysql/files/my.cnf-5.5}    |   25 ++++++++++++-------
 eclass/mysql-cmake.eclass                          |    2 +-
 4 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.1
index 2330a32..e5738e6 100644
--- a/dev-db/mariadb/files/my.cnf-5.1
+++ b/dev-db/mariadb/files/my.cnf-5.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-4.1,v 1.4 2008/11/14 02:16:25 robbat2 Exp $
+# $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]
@@ -9,27 +9,27 @@ socket						= /var/run/mysqld/mysqld.sock
 
 [mysql]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqladmin]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlcheck]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqldump]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlimport]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlshow]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [myisamchk]
 character-sets-dir=/usr/share/mysql/charsets
@@ -54,7 +54,7 @@ datadir 					= @DATADIR@
 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
@@ -122,6 +122,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

diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.5
similarity index 90%
copy from dev-db/mariadb/files/my.cnf-5.1
copy to dev-db/mariadb/files/my.cnf-5.5
index 2330a32..90b17b2 100644
--- a/dev-db/mariadb/files/my.cnf-5.1
+++ b/dev-db/mariadb/files/my.cnf-5.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-4.1,v 1.4 2008/11/14 02:16:25 robbat2 Exp $
+# $Header: $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -9,27 +9,27 @@ socket						= /var/run/mysqld/mysqld.sock
 
 [mysql]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqladmin]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlcheck]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqldump]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlimport]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlshow]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [myisamchk]
 character-sets-dir=/usr/share/mysql/charsets
@@ -54,13 +54,15 @@ datadir 					= @DATADIR@
 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
 read_rnd_buffer_size 		= 512K
 myisam_sort_buffer_size 	= 8M
-language 					= /usr/share/mysql/english
+lc_messages_dir			= /usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
 
 # security:
 # using "localhost" in connects uses sockets by default
@@ -122,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
@@ -144,3 +150,4 @@ write_buffer 				= 2M
 
 [mysqlhotcopy]
 interactive-timeout
+

diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.5
similarity index 90%
copy from dev-db/mariadb/files/my.cnf-5.1
copy to dev-db/mysql/files/my.cnf-5.5
index 2330a32..90b17b2 100644
--- a/dev-db/mariadb/files/my.cnf-5.1
+++ b/dev-db/mysql/files/my.cnf-5.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-4.1,v 1.4 2008/11/14 02:16:25 robbat2 Exp $
+# $Header: $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -9,27 +9,27 @@ socket						= /var/run/mysqld/mysqld.sock
 
 [mysql]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqladmin]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlcheck]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqldump]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlimport]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [mysqlshow]
 character-sets-dir=/usr/share/mysql/charsets
-character-set-server=utf8
+default-character-set=utf8
 
 [myisamchk]
 character-sets-dir=/usr/share/mysql/charsets
@@ -54,13 +54,15 @@ datadir 					= @DATADIR@
 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
 read_rnd_buffer_size 		= 512K
 myisam_sort_buffer_size 	= 8M
-language 					= /usr/share/mysql/english
+lc_messages_dir			= /usr/share/mysql
+#Set this to your desired error message language
+lc_messages			= en_US
 
 # security:
 # using "localhost" in connects uses sockets by default
@@ -122,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
@@ -144,3 +150,4 @@ write_buffer 				= 2M
 
 [mysqlhotcopy]
 interactive-timeout
+

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 225c3b7..4092c9b 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -331,7 +331,7 @@ mysql-cmake_src_install() {
 
 	# Configuration stuff
 	case ${MYSQL_PV_MAJOR} in
-		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
+		5.[5-9]|6*|7*) mysql_mycnf_version="5.5" ;;
 	esac
 	einfo "Building default my.cnf (${mysql_mycnf_version})"
 	insinto "${MY_SYSCONFDIR}"


             reply	other threads:[~2013-01-20  2:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-20  2:15 Robin H. Johnson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-06-27 16:33 [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/, eclass/, dev-db/mysql/files/ Jorge Manuel B. S. Vicetto
2013-06-27 16:37 Jorge Manuel B. S. Vicetto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1354037399.2e5fd44e2aa390f0712913961723b2ae51540cc0.robbat2@gentoo \
    --to=robbat2@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox