summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Riosa <vivo@gentoo.org>2005-07-16 03:13:25 +0000
committerFrancesco Riosa <vivo@gentoo.org>2005-07-16 03:13:25 +0000
commit4d65c9c74afc19af2f845405e517abf68e6d76f6 (patch)
treef8c2cd62d7a567ba9680da8392a9e39c58423faf /dev-db/mysql
parentchange ppc-macos conditional to userland_Darwin (diff)
downloadhistorical-4d65c9c74afc19af2f845405e517abf68e6d76f6.tar.gz
historical-4d65c9c74afc19af2f845405e517abf68e6d76f6.tar.bz2
historical-4d65c9c74afc19af2f845405e517abf68e6d76f6.zip
Adding patches needed for mysql-5.0.9_beta
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-db/mysql')
-rw-r--r--dev-db/mysql/ChangeLog6
-rw-r--r--dev-db/mysql/Manifest5
-rw-r--r--dev-db/mysql/files/010_all_my-print-defaults-r2.patch42
-rw-r--r--dev-db/mysql/files/701_all_test-myisam-geometry.patch26
-rw-r--r--dev-db/mysql/files/703_all_test-rpl_rotate_logs.patch18
5 files changed, 94 insertions, 3 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index b33f6da9810d..4ae1f22f0b3a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for dev-db/mysql
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.206 2005/07/16 02:54:38 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.207 2005/07/16 03:13:25 vivo Exp $
16 Jul 2005; portage <vivo@gentoo.org>
-files/mysql-4.0.25-asm-pic-fixes.patch,
@@ -15,7 +15,9 @@
16 Jul 2005; portage <vivo@gentoo.org>
+files/mysql-4.0.25-r1-asm-pic-fixes.patch,
+files/035_x86_asm-pic-fixes-r1.patch, +mysql-4.0.25-r1.ebuild,
- +mysql-4.1.12-r2.ebuild, +mysql-5.0.9_beta-r1.ebuild:
+ +mysql-4.1.12-r2.ebuild, +mysql-5.0.9_beta-r1.ebuild,
+ +010_all_my-print-defaults-r2.patch, +701_all_test-myisam-geometry.patch,
+ +703_all_test-rpl_rotate_logs.patch:
Going back to patches from "PaX Team" since the upstream one give unexpected
results running the test suite.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index f18f5373fdca..bf53ed6a8743 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -15,7 +15,7 @@ MD5 6b4e7861f8acedbd5f7675160efb9dfb mysql-5.0.9_beta-r1.ebuild 16096
MD5 be85068e1f8dd9340882814ae10e1763 mysql-4.0.23-r1.ebuild 9160
MD5 950a2a955947846b03dbb285f5a53daf mysql-4.1.12.ebuild 15584
MD5 f26f6906248f45f5f0d23248a39c03a4 mysql-4.0.24.ebuild 9816
-MD5 8a23894d7a9fa3d37451fb5dcfef2012 ChangeLog 33274
+MD5 474c59290c9171861cf87a8525b58bdc ChangeLog 33390
MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
@@ -39,12 +39,14 @@ MD5 ee67067f786849424c4591e278819bbc files/digest-mysql-4.1.12 66
MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
+MD5 9209843349ac5e9560f9ad7450c49769 files/703_all_test-rpl_rotate_logs.patch 802
MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055
MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8 65
MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
+MD5 46b0857fe11abf1015f0db6da26614ff files/010_all_my-print-defaults-r2.patch 907
MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
@@ -62,6 +64,7 @@ MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
MD5 c4785801e45235c28d7a4139bfbd73af files/my.cnf-4.1 3667
MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 a9f61fe89f1a43f6c5a8de100176d2dc files/701_all_test-myisam-geometry.patch 1239
MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905
MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
diff --git a/dev-db/mysql/files/010_all_my-print-defaults-r2.patch b/dev-db/mysql/files/010_all_my-print-defaults-r2.patch
new file mode 100644
index 000000000000..6c0ac1a425e0
--- /dev/null
+++ b/dev-db/mysql/files/010_all_my-print-defaults-r2.patch
@@ -0,0 +1,42 @@
+###MY_VER_RANGE [5.0.6_beta)
+--- mysql.old/mysys/default.c 2005-05-22 02:35:25.000000000 +0200
++++ mysql/mysys/default.c 2005-05-22 02:36:17.000000000 +0200
+@@ -823,19 +823,19 @@
+ 5. ""
+
+ On Novell NetWare, this is:
+- 1. sys:/etc/
++ 1. sys:/etc/mysql/
+ 2. getenv(DEFAULT_HOME_ENV)
+ 3. ""
+
+ On OS/2, this is:
+ 1. getenv(ETC)
+- 2. /etc/
++ 2. /etc/mysql/
+ 3. getenv(DEFAULT_HOME_ENV)
+ 4. ""
+ 5. "~/"
+
+ Everywhere else, this is:
+- 1. /etc/
++ 1. /etc/mysql/
+ 2. getenv(DEFAULT_HOME_ENV)
+ 3. ""
+ 4. "~/"
+@@ -860,13 +860,13 @@
+ #endif
+
+ #elif defined(__NETWARE__)
+- *ptr++= "sys:/etc/";
++ *ptr++= "sys:/etc/mysql/";
+ #else
+ #if defined(__EMX__) || defined(OS2)
+ if ((env= getenv("ETC")))
+ *ptr++= env;
+ #endif
+- *ptr++= "/etc/";
++ *ptr++= "/etc/mysql/";
+ #endif
+ if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
+ *ptr++= env;
diff --git a/dev-db/mysql/files/701_all_test-myisam-geometry.patch b/dev-db/mysql/files/701_all_test-myisam-geometry.patch
new file mode 100644
index 000000000000..a9acb6b85193
--- /dev/null
+++ b/dev-db/mysql/files/701_all_test-myisam-geometry.patch
@@ -0,0 +1,26 @@
+###MY_VER_RANGE [4.1.3_alpha,)
+
+# MySQL Bugs: #11083: myisam.test fail w/ --without-geometry
+
+--- mysql.orig/mysql-test/t/myisam.test 2005-05-26 16:55:48.000000000 +0200
++++ mysql.fix/mysql-test/t/myisam.test 2005-06-03 21:26:28.000000000 +0200
+@@ -479,7 +479,7 @@
+ #
+ # Test RTREE index
+ #
+---error 1235
++--error 1235,1289
+ CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
+ # INSERT INTO t1 VALUES (1,1),(1,1);
+ # DELETE FROM rt WHERE a<1;
+--- mysql.orig/mysql-test/r/myisam.result 2005-05-26 16:55:48.000000000 +0200
++++ mysql.fix/mysql-test/r/myisam.result 2005-06-03 21:27:20.000000000 +0200
+@@ -506,7 +506,7 @@
+ 1 SIMPLE t2 index NULL PRIMARY 4 NULL 2 Using index; Distinct
+ drop table t1,t2;
+ CREATE TABLE t1 (`a` int(11) NOT NULL default '0', `b` int(11) NOT NULL default '0', UNIQUE KEY `a` USING RTREE (`a`,`b`)) ENGINE=MyISAM;
+-ERROR 42000: This version of MySQL doesn't yet support 'RTREE INDEX'
++Got one of the listed errors
+ create table t1 (a int, b varchar(200), c text not null) checksum=1;
+ create table t2 (a int, b varchar(200), c text not null) checksum=0;
+ insert t1 values (1, "aaa", "bbb"), (NULL, "", "ccccc"), (0, NULL, "");
diff --git a/dev-db/mysql/files/703_all_test-rpl_rotate_logs.patch b/dev-db/mysql/files/703_all_test-rpl_rotate_logs.patch
new file mode 100644
index 000000000000..9fd3079408d1
--- /dev/null
+++ b/dev-db/mysql/files/703_all_test-rpl_rotate_logs.patch
@@ -0,0 +1,18 @@
+###MY_VER_RANGE [5.0.6_beta,5.1.0_alpha) [5.1.0_alpha,)
+
+# MySQL Bugs: #9763: Test rpl_rotate_logs fails in default mode and with --force
+# Error: 1201 SQLSTATE: HY000 (ER_MASTER_INFO)
+# Message: Could not initialize master info structure; more error messages can be found in the MySQL
+# error log
+
+--- mysql.orig/mysql-test/t/rpl_rotate_logs.test 2005-05-26 16:55:48.000000000 +0200
++++ mysql.fix/mysql-test/t/rpl_rotate_logs.test 2005-06-03 20:21:51.000000000 +0200
+@@ -24,7 +24,7 @@
+ # START SLAVE will fail because it can't read the file (mode 000)
+ # (system error 13)
+ --replace_result $MYSQL_TEST_DIR TESTDIR
+---error 1105,1105,29
++--error 1201,1105,29
+ start slave;
+ system chmod 600 var/slave-data/master.info;
+ # It will fail again because the file is empty so the slave cannot get valuable