summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-db/mysql/files/my.cnf-5.72
-rw-r--r--dev-db/mysql/files/my.cnf.distro-client6
-rw-r--r--dev-db/mysql/files/my.cnf.distro-server4
-rw-r--r--dev-db/mysql/mysql-5.7.21.ebuild10
4 files changed, 11 insertions, 11 deletions
diff --git a/dev-db/mysql/files/my.cnf-5.7 b/dev-db/mysql/files/my.cnf-5.7
index 80b4771..571ebf0 100644
--- a/dev-db/mysql/files/my.cnf-5.7
+++ b/dev-db/mysql/files/my.cnf-5.7
@@ -1,3 +1,3 @@
# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
-!includedir @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mariadb.d
+!includedir @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d
diff --git a/dev-db/mysql/files/my.cnf.distro-client b/dev-db/mysql/files/my.cnf.distro-client
index 4bbe0f9..8bf1836 100644
--- a/dev-db/mysql/files/my.cnf.distro-client
+++ b/dev-db/mysql/files/my.cnf.distro-client
@@ -3,7 +3,7 @@
# The following options will be passed to all MySQL clients
[client]
socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-character-sets-dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
+character-sets-dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
default-character-set=utf8
[mysql]
@@ -15,7 +15,7 @@ quick
max_allowed_packet = 16M
[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
+character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
diff --git a/dev-db/mysql/files/my.cnf.distro-server b/dev-db/mysql/files/my.cnf.distro-server
index eaf80be..d4ed30c 100644
--- a/dev-db/mysql/files/my.cnf.distro-server
+++ b/dev-db/mysql/files/my.cnf.distro-server
@@ -6,12 +6,12 @@ character-set-server = utf8
user = mysql
port = 3306
socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mariadb.pid
+pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysql.pid
log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
basedir = @GENTOO_PORTAGE_EPREFIX@/usr
datadir = @DATADIR@
skip-external-locking
-lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb
+lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
#Set this to your desired error message language
lc_messages = en_US
diff --git a/dev-db/mysql/mysql-5.7.21.ebuild b/dev-db/mysql/mysql-5.7.21.ebuild
index b82d76e..a7c32dc 100644
--- a/dev-db/mysql/mysql-5.7.21.ebuild
+++ b/dev-db/mysql/mysql-5.7.21.ebuild
@@ -278,7 +278,7 @@ multilib_src_configure() {
-DWITH_CURL=system
)
if use test ; then
- mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+ mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
else
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
fi
@@ -445,7 +445,7 @@ multilib_src_install_all() {
cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die
eprefixify "${TMPDIR}/my.cnf"
doins "${TMPDIR}/my.cnf"
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+ insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d"
cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die
eprefixify "${TMPDIR}/50-distro-client.cnf"
doins "${TMPDIR}/50-distro-client.cnf"
@@ -539,7 +539,7 @@ src_test() {
pushd "${TESTDIR}" > /dev/null || die
touch "${T}/disabled.def"
- # These are failing in MariaDB 10.0 for now and are believed to be
+ # These are failing in MySQL 5.7 for now and are believed to be
# false positives:
#
# main.mysql_client_test, main.mysql_client_test_nonblock
@@ -579,7 +579,7 @@ src_test() {
}
mysql_init_vars() {
- MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+ MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
@@ -794,7 +794,7 @@ pkg_config() {
# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
- local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
+ local cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
einfo "Command: ${cmd[*]}"