commit: e71231e36dc2daf85584b930da13f062b00d2e38 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Tue Nov 12 14:11:04 2019 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Tue Nov 12 14:11:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71231e3
dev-db/mariadb: Fix references to character sets in 5.5 Closes: https://bugs.gentoo.org/692482 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> dev-db/mariadb/files/my.cnf-5.5 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5 index dec0c4cb8ee..289af8a24d0 100644 --- a/dev-db/mariadb/files/my.cnf-5.5 +++ b/dev-db/mariadb/files/my.cnf-5.5 @@ -7,34 +7,34 @@ port = 3306 socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock [mysql] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqladmin] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqlcheck] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqldump] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqlimport] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [mysqlshow] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets default-character-set=utf8 [myisamchk] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets [myisampack] -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets # use [safe_mysqld] with mysql-3 [mysqld_safe] @@ -59,7 +59,7 @@ net_buffer_length = 8K read_buffer_size = 256K read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M -lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql +lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb #Set this to your desired error message language lc_messages = en_US