fix bugs #26131 and #24826

2 files changed, 40 insertions, 31 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 765cab566955..9c450b5db8c7 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.63 2003/08/04 00:46:14 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.64 2003/08/11 10:40:37 robbat2 Exp $
+
+*mysql-4.0.14-r1 (11 Aug 2003)
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild,
+  files/my.cnf-4.0.14-r1:
+  fix bugs #26131 and #24826
 
   31 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14.ebuild:
   Remove extraneous warning about a bug that was fixed between .13 and .14
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f4de68b92e60..bce1ffbdd848 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,38 +1,41 @@
-MD5 2aba3bd55edc94be6b81c906808e18bb ChangeLog 10232
-MD5 2d9fd1c37cc537963c5b77f2088a335c mysql-3.23.52-r1.ebuild 5873
-MD5 c63efd889b589a982ec42c3381e93d1a mysql-3.23.56.ebuild 6548
-MD5 f0015144c259bd17ac209d3ea53bdf52 mysql-3.23.57.ebuild 6551
-MD5 97c81477d982abdc1f0f5e26277df287 mysql-4.0.12.ebuild 6784
-MD5 7f1dbd9214eed1d29c24b086dd180c98 mysql-4.0.13-r1.ebuild 6453
-MD5 634fb0724ae711e55f16b1386d632ec4 mysql-4.0.13-r2.ebuild 6445
-MD5 7ec2368a948357c9d0f9e28a9b8db0bd mysql-4.0.13-r3.ebuild 7128
-MD5 3a236c5942302a33f57f3e60fecdc4c8 mysql-4.0.13.ebuild 6604
-MD5 f966d56a3dfb47786db23b1a2af019e6 mysql-4.0.14.ebuild 6919
+MD5 230f1fb1b0fedce4997ec435d06675e7 mysql-3.23.56.ebuild 6547
+MD5 9d13f2f07418d8a85c60215ca5154a14 mysql-4.0.12.ebuild 6783
+MD5 b64d68609c59d34bcf939fb6b286aec4 mysql-4.0.14.ebuild 6918
+MD5 b1716c908bb6b91f9d95929d8882d362 mysql-3.23.52-r1.ebuild 5872
+MD5 2016c8172ffeb2d0277383931c5b73cc mysql-4.0.13-r2.ebuild 6444
+MD5 43b5859c9419f23935c0c36f1074596d mysql-4.0.14-r1.ebuild 6928
+MD5 a3702a4c1f2b7118dcd12c8157f07009 mysql-3.23.57.ebuild 6550
+MD5 5f832ff4cd3f663264c59ed2cef9f78f mysql-4.0.13.ebuild 6603
+MD5 afdb302639a6f959bd5715a968162b0e mysql-4.0.13-r1.ebuild 6452
+MD5 02ccfb9c7090183081859b7ddac8c8b2 ChangeLog 10231
+MD5 c588cc151fef0b6f588fd21d2a500353 mysql-4.0.13-r3.ebuild 7127
+MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
+MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
+MD5 6b6ee32d2f9f3030b5fcea0a2a9a5360 files/mysql-4.0.rc6 950
 MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
-MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
-MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
+MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
+MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
+MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
 MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
 MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13 66
-MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r1 66
-MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r2 66
-MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r3 66
 MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14 66
-MD5 47c66444b6a1e2243eadf931d52d34b2 files/my.cnf 1229
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
-MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
-MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
-MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
 MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
+MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
+MD5 afbf3b6821056a31ee09430933f8fb47 files/mysql.init 903
+MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
 MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
+MD5 cfe027a0b863abadb46f75e4cf840c28 files/my.cnf 1228
+MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
 MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
-MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
+MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
+MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
+MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
+MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
+MD5 7bcc53587416ce1b1925ea05d463cdaa files/my.cnf-4.0.14-r1 2803
+MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r1 66
+MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r2 66
+MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r3 66
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r1 66
 MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
-MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
-MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
-MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
-MD5 5bfc671c63667e6f4c8d48f9edc6076e files/mysql.init 904
-MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557