From 652b269cca3dd58899faf637fbf76a49d12e93ff Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 8 Apr 2005 00:02:33 +0000 Subject: [PATCH] Update to MySQL 4.1.11 to fix bz#152911; also fix bz#154123, bz#143537. --- .cvsignore | 2 +- mysql-testing.patch | 21 +++++---------------- mysql.spec | 19 +++++++++++++------ sources | 2 +- 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6bc59c..13ec4b4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-4.1.10a.tar.gz +mysql-4.1.11.tar.gz diff --git a/mysql-testing.patch b/mysql-testing.patch index cc6b6f4..5e4697d 100644 --- a/mysql-testing.patch +++ b/mysql-testing.patch @@ -2,19 +2,17 @@ This patch is needed to improve the probability that the MySQL tests pass in Red Hat's build environment. The 32-bit and 64-bit variants of a single architecture may be built on the same machine at the same time, so we have to ensure that the tests use different port numbers on a 64-bit arch than -on a 32-bit, else they will interfere with each other. Also increase a -timeout that has been observed to get violated under heavy load. +on a 32-bit, else they will interfere with each other. -diff -Naur mysql-4.1.9.orig/mysql-test/mysql-test-run.sh mysql-4.1.9/mysql-test/mysql-test-run.sh ---- mysql-4.1.9.orig/mysql-test/mysql-test-run.sh 2005-01-11 17:06:03.000000000 -0500 -+++ mysql-4.1.9/mysql-test/mysql-test-run.sh 2005-01-15 19:44:10.780699826 -0500 -@@ -200,12 +200,24 @@ +diff -Naur mysql-4.1.11.orig/mysql-test/mysql-test-run.sh mysql-4.1.11/mysql-test/mysql-test-run.sh +--- mysql-4.1.11.orig/mysql-test/mysql-test-run.sh 2005-04-07 16:09:59.971778102 -0400 ++++ mysql-4.1.11/mysql-test/mysql-test-run.sh 2005-04-07 16:11:29.993510299 -0400 +@@ -200,11 +200,24 @@ MASTER_RUNNING=0 MASTER1_RUNNING=0 -MASTER_MYPORT=9306 --MASTER_MYPORT1=9307 SLAVE_RUNNING=0 -SLAVE_MYPORT=9308 # leave room for 2 masters for cluster tests -MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves @@ -39,12 +37,3 @@ diff -Naur mysql-4.1.9.orig/mysql-test/mysql-test-run.sh mysql-4.1.9/mysql-test/ MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log MYSQL_MANAGER_USER=root -@@ -230,7 +242,7 @@ - SLEEP_TIME_FOR_FIRST_MASTER=400 # Enough time to create innodb tables - SLEEP_TIME_FOR_SECOND_MASTER=400 - SLEEP_TIME_FOR_FIRST_SLAVE=400 --SLEEP_TIME_FOR_SECOND_SLAVE=30 -+SLEEP_TIME_FOR_SECOND_SLAVE=60 - CHARACTER_SET=latin1 - DBUSER="" - START_WAIT_TIMEOUT=10 diff --git a/mysql.spec b/mysql.spec index 1a6890c..deb5d20 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,5 +1,5 @@ Name: mysql -Version: 4.1.10a +Version: 4.1.11 Release: 1 Source0: http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-%{version}.tar.gz Source1: mysql.init @@ -12,7 +12,7 @@ Patch1: mysql-libdir.patch Patch2: mysql-errno.patch Patch3: mysql-libtool.patch Patch4: mysql-testing.patch -Patch5: mysql-4.1.10-macro-safety.patch +Patch5: mysql-threads.patch URL: http://www.mysql.com BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: MySQL client programs and shared libraries. @@ -24,7 +24,6 @@ BuildRequires: gcc-c++, ncurses-devel, zlib-devel BuildRequires: libtool automake autoconf Requires: bash Conflicts: MySQL -Requires: perl-DBI, perl-DBD-MySQL Obsoletes: mysql-client mysql-perl # make test requires time BuildRequires: time @@ -46,6 +45,8 @@ License: GPL Group: Applications/Databases Prereq: /sbin/chkconfig, /usr/sbin/useradd Requires: %{name} = %{version}-%{release}, sh-utils +# mysqlhotcopy needs DBI/DBD support +Requires: perl-DBI, perl-DBD-MySQL Conflicts: MySQL-server %description server @@ -124,7 +125,8 @@ export CFLAGS CXXFLAGS --enable-local-infile \ --enable-large-files=yes --enable-largefile=yes \ --with-berkeley-db \ - --enable-thread-safe-client + --enable-thread-safe-client \ + --with-named-thread-libs="-lpthread" gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4} @@ -132,9 +134,7 @@ gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4} make %{?_smp_mflags} make check -%ifnarch s390x make test -%endif %install rm -rf $RPM_BUILD_ROOT @@ -363,6 +363,13 @@ fi %{_datadir}/sql-bench %changelog +* Thu Apr 7 2005 Tom Lane 4.1.11-1 +- Update to MySQL 4.1.11 to fix bz#152911 as well as other issues +- Move perl-DBI, perl-DBD-MySQL dependencies to server package (bz#154123) +- Override configure thread library test to suppress HAVE_LINUXTHREADS check +- Fix BDB failure on s390x (bz#143537) +- At last we can enable "make test" on all arches + * Fri Mar 11 2005 Tom Lane 4.1.10a-1 - Update to MySQL 4.1.10a to fix security vulnerabilities (bz#150868, for CAN-2005-0711, and bz#150871 for CAN-2005-0709, CAN-2005-0710). diff --git a/sources b/sources index 91e8450..5f5d185 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a4a6a5b3d0a42a9a271b2b8867bde82 mysql-4.1.10a.tar.gz +0b99001b07cad53f161ec629a6bb24ea mysql-4.1.11.tar.gz