summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Riosa <vivo@gentoo.org>2006-02-01 20:25:56 +0000
committerFrancesco Riosa <vivo@gentoo.org>2006-02-01 20:25:56 +0000
commit01f45729c473f79b2abe187f35e17c4e16a674d5 (patch)
treef462d90e2a14cac92f0bb2d0b5d582f2a86ac15d /dev-db/mysql/files
parentVersion bump (#121201), with cleaned (R)DEPEND (diff)
downloadgentoo-2-01f45729c473f79b2abe187f35e17c4e16a674d5.tar.gz
gentoo-2-01f45729c473f79b2abe187f35e17c4e16a674d5.tar.bz2
gentoo-2-01f45729c473f79b2abe187f35e17c4e16a674d5.zip
Bring back the socket path to it's previous default /var/run/mysqld/mysqld.sock to make happyer many ebuilds
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'dev-db/mysql/files')
-rw-r--r--dev-db/mysql/files/my.cnf-4.1-r16
1 files changed, 3 insertions, 3 deletions
diff --git a/dev-db/mysql/files/my.cnf-4.1-r1 b/dev-db/mysql/files/my.cnf-4.1-r1
index fe74425fa5fe..cb650ec557d2 100644
--- a/dev-db/mysql/files/my.cnf-4.1-r1
+++ b/dev-db/mysql/files/my.cnf-4.1-r1
@@ -1,11 +1,11 @@
# /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1-r1,v 1.2 2006/02/01 16:35:36 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1-r1,v 1.3 2006/02/01 20:25:56 vivo Exp $
# The following options will be passed to all MySQL clients
[client]
#password = your_password
port = 3306
-socket = /var/run/mysqld/mysqld@MY_SUFFIX@.sock
+socket = /var/run/mysqld/mysqld.sock
[mysql]
character-sets-dir=utf8
@@ -47,7 +47,7 @@ character-set-server = utf8
default-character-set = utf8
user = mysql
port = 3306
-socket = /var/run/mysqld/mysqld@MY_SUFFIX@.sock
+socket = /var/run/mysqld/mysqld.sock
pid-file = /var/run/mysqld/mysqld@MY_SUFFIX@.pid
log-error = /var/log/mysql@MY_SUFFIX@/mysqld.err
basedir = /usr