summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-db/mysql/ChangeLog6
-rw-r--r--dev-db/mysql/Manifest22
-rw-r--r--dev-db/mysql/files/my.cnf-4.1-r16
3 files changed, 14 insertions, 20 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 2d441c6ffaf9..cbd60106912d 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/mysql
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.297 2006/02/01 16:35:35 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.298 2006/02/01 20:25:56 vivo Exp $
+
+ 01 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/my.cnf-4.1-r1:
+ Bring back the socket path to it's previous default
+ "/var/run/mysqld/mysqld.sock" to make happyer many ebuilds
01 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/my.cnf-4.1-r1:
my.cnf revert changed related to innodb
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 710e0475663f..6d5e2f82a93c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 139fb775b9e726fbe4aaa723a6b93483 ChangeLog 60325
-RMD160 246bbaa5866d6f0912ad60866f6451633b817280 ChangeLog 60325
-SHA256 f1692245a77a8a384391d0343b726bf37e9f3331cd6259b7ee3159db25b4892b ChangeLog 60325
+MD5 a2ac0fdbc4f79b7cc4260233921e761c ChangeLog 60511
+RMD160 b6022f85a0eb33c7a8349391929b758bb7aef155 ChangeLog 60511
+SHA256 6bc03695cd0a39ee3c56820c0092725e174558640ebb3300c2566b2c0a11604c ChangeLog 60511
MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
RMD160 eedbaecbaf03a55c5510f74aa508ff9075bf151f files/digest-mysql-3.23.58-r1 140
SHA256 f08bf2eb63cd3809353ab2fbef2cf50ba57c6d8df0c696631b2577dae741f12e files/digest-mysql-3.23.58-r1 140
@@ -49,9 +46,9 @@ SHA256 aafe65eb29b759c0cf19d81f3e26d95981a67662d3804454847cc4854839a34b files/my
MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
RMD160 28f61031229c1066e4b3122a624ea3ce050f8c39 files/my.cnf-4.1 4068
SHA256 6d5ce7c495a09182fa57f2d148f0d76ecbaed8dfefe1804cd387713a4f7ac054 files/my.cnf-4.1 4068
-MD5 e033b9f236567022fc433f76045065f4 files/my.cnf-4.1-r1 4187
-RMD160 3ffb269b7d6a040a95ff9250f5cf42b58f1ae13a files/my.cnf-4.1-r1 4187
-SHA256 9594266954ce272a22ddde359b7550b7c4000fa950ea378969eb4f008d6981ce files/my.cnf-4.1-r1 4187
+MD5 129be8520b577c709894770793a8e9e0 files/my.cnf-4.1-r1 4165
+RMD160 515a40498cdb7538828c6226ab8e068f5294cbf2 files/my.cnf-4.1-r1 4165
+SHA256 93ac545235301d2b7c12d4ab8a3db7811abd9eb8b61e9f7fd9fd6860e0843749 files/my.cnf-4.1-r1 4165
MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
RMD160 f0ef64b31bcf919f4e63ba3eab679a4db9074f80 files/mysql-4.0.15.rc6 1187
SHA256 62ed0c50ad425b856ef627f2e825841081c829fc33d57d4d34313635b7c03998 files/mysql-4.0.15.rc6 1187
@@ -115,10 +112,3 @@ SHA256 3700b90efc5fda0c0a5415736890149d3b8aadc005f6cea20c31e3e9057e719b mysql-5.
MD5 51a06a62df32804d95eb0865d5117f07 mysql-5.1.4_alpha-r30.ebuild 1980
RMD160 85d8e2872a154dd8e0baf2b32cf67d2b7450ae37 mysql-5.1.4_alpha-r30.ebuild 1980
SHA256 3a1e1c8d111f9c74a9b96b85e45f5508537b8726808ddf952d23b5e011476066 mysql-5.1.4_alpha-r30.ebuild 1980
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD4ONoKolR564NvWYRAtBMAKCvMIu7eOtdL1MRi7z8s6R24ccrGQCfR7cp
-VyUC3Rs+Vw6ENWxtB22Ci6c=
-=rNxR
------END PGP SIGNATURE-----
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