summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-03-24 18:27:39 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-03-24 18:27:39 +0000
commit7583f6d0efe077cb0954c32bc0d6be89be10d5be (patch)
treef71f30d06ad4c5519651e2bc5a0e2cc42c639eda /dev-db/mysql-community
parentAdd libXinerama to (R)DEPEND, bug #311131 (diff)
downloadhistorical-7583f6d0efe077cb0954c32bc0d6be89be10d5be.tar.gz
historical-7583f6d0efe077cb0954c32bc0d6be89be10d5be.tar.bz2
historical-7583f6d0efe077cb0954c32bc0d6be89be10d5be.zip
Missed copying back last version of the new my.cnf from my personal overlay, and caused bug #311151.
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
Diffstat (limited to 'dev-db/mysql-community')
-rw-r--r--dev-db/mysql-community/ChangeLog6
-rw-r--r--dev-db/mysql-community/files/my.cnf-5.114
2 files changed, 12 insertions, 8 deletions
diff --git a/dev-db/mysql-community/ChangeLog b/dev-db/mysql-community/ChangeLog
index c8b90fd4397b..1ef6cfd3a537 100644
--- a/dev-db/mysql-community/ChangeLog
+++ b/dev-db/mysql-community/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/mysql-community
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.29 2010/03/24 02:22:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.30 2010/03/24 18:26:40 robbat2 Exp $
+
+ 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-5.1:
+ Missed copying back last version of the new my.cnf from my personal
+ overlay, and caused bug #311151.
24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-5.1:
Just add new config files that gets rid of some deprecated warnings, so
diff --git a/dev-db/mysql-community/files/my.cnf-5.1 b/dev-db/mysql-community/files/my.cnf-5.1
index 57342d0d00b2..4f94277f669c 100644
--- a/dev-db/mysql-community/files/my.cnf-5.1
+++ b/dev-db/mysql-community/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-community/files/my.cnf-5.1,v 1.1 2010/03/24 02:22:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/files/my.cnf-5.1,v 1.2 2010/03/24 18:26:40 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