* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/, eclass/, dev-db/mysql/files/
@ 2013-01-20 2:15 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2013-01-20 2:15 UTC (permalink / raw
To: gentoo-commits
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}"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/, eclass/, dev-db/mysql/files/
@ 2013-06-27 16:33 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 3+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-06-27 16:33 UTC (permalink / raw
To: gentoo-commits
commit: 0ba64e263143e27230d46a6b148ec08a5baf2481
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 15:49:06 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 16:33:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0ba64e26
[eclass] Add env file to add /usr/lib/mysql to LDPATH. Fixes bug 474952.
---
dev-db/mariadb/files/80mariadb-libdir | 1 +
dev-db/mysql/files/80mysql-libdir | 1 +
eclass/mysql-cmake.eclass | 3 +++
3 files changed, 5 insertions(+)
diff --git a/dev-db/mariadb/files/80mariadb-libdir b/dev-db/mariadb/files/80mariadb-libdir
new file mode 100644
index 0000000..083fe25
--- /dev/null
+++ b/dev-db/mariadb/files/80mariadb-libdir
@@ -0,0 +1 @@
+LDPATH="/usr/local/mysql"
diff --git a/dev-db/mysql/files/80mysql-libdir b/dev-db/mysql/files/80mysql-libdir
new file mode 100644
index 0000000..297f388
--- /dev/null
+++ b/dev-db/mysql/files/80mysql-libdir
@@ -0,0 +1 @@
+LDPATH="/usr/lib/mysql"
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 4fb2499..c9dcbea 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -415,4 +415,7 @@ mysql-cmake_src_install() {
#Remove mytop if perl is not selected
[[ ${PN} == "mariadb" ]] && ! use perl \
&& rm -f "${ED}/usr/bin/mytop"
+
+ # Install env file so that programs can find libmysqlclient
+ doenvd "${FILESDIR}/80${PN}-libdir"
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/files/, eclass/, dev-db/mysql/files/
@ 2013-06-27 16:37 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 3+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-06-27 16:37 UTC (permalink / raw
To: gentoo-commits
commit: d5b51c57b0d7c8068df60ea60f04b95384e03459
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 16:37:13 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 16:37:13 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d5b51c57
[eclass] Drop the env files and update Brian's update to name the env file as 80mysql-libdir.
---
dev-db/mariadb/files/80mariadb-libdir | 1 -
dev-db/mysql/files/80mysql-libdir | 1 -
eclass/mysql-cmake.eclass | 7 ++-----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dev-db/mariadb/files/80mariadb-libdir b/dev-db/mariadb/files/80mariadb-libdir
deleted file mode 100644
index 083fe25..0000000
--- a/dev-db/mariadb/files/80mariadb-libdir
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH="/usr/local/mysql"
diff --git a/dev-db/mysql/files/80mysql-libdir b/dev-db/mysql/files/80mysql-libdir
deleted file mode 100644
index 297f388..0000000
--- a/dev-db/mysql/files/80mysql-libdir
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH="/usr/lib/mysql"
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index c9dcbea..f31e4a6 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -407,15 +407,12 @@ mysql-cmake_src_install() {
done
fi
- cat <<-EOF > "${T}"/40mysql
+ cat <<-EOF > "${T}"/80mysql-libdir
LDPATH="${EPREFIX}/usr/$(get_libdir)/mysql"
EOF
- doenvd "${T}"/40mysql
+ doenvd "${T}"/80mysql-libdir
#Remove mytop if perl is not selected
[[ ${PN} == "mariadb" ]] && ! use perl \
&& rm -f "${ED}/usr/bin/mytop"
-
- # Install env file so that programs can find libmysqlclient
- doenvd "${FILESDIR}/80${PN}-libdir"
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-27 16:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- strict thread matches above, loose matches on Subject: below --
2013-06-27 16:37 Jorge Manuel B. S. Vicetto
2013-01-20 2:15 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox