diff --git a/.cvsignore b/.cvsignore index 65b2ddb..34f64e5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-4.1.7.tar.gz +mysql-4.1.9.tar.gz diff --git a/mysql-testing.patch b/mysql-testing.patch index fefbe49..cc6b6f4 100644 --- a/mysql-testing.patch +++ b/mysql-testing.patch @@ -6,10 +6,10 @@ 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. -diff -Naur mysql-4.1.7.orig/mysql-test/mysql-test-run.sh mysql-4.1.7/mysql-test/mysql-test-run.sh ---- mysql-4.1.7.orig/mysql-test/mysql-test-run.sh 2004-10-23 03:28:47.000000000 -0400 -+++ mysql-4.1.7/mysql-test/mysql-test-run.sh 2004-12-21 15:51:11.000000000 -0500 -@@ -199,12 +199,24 @@ +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 @@ MASTER_RUNNING=0 MASTER1_RUNNING=0 @@ -39,12 +39,9 @@ diff -Naur mysql-4.1.7.orig/mysql-test/mysql-test-run.sh mysql-4.1.7/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 -@@ -227,9 +239,9 @@ - SLEEP_TIME_AFTER_RESTART=1 - SLEEP_TIME_FOR_DELETE=10 +@@ -230,7 +242,7 @@ SLEEP_TIME_FOR_FIRST_MASTER=400 # Enough time to create innodb tables --SLEEP_TIME_FOR_SECOND_MASTER=30 -+SLEEP_TIME_FOR_SECOND_MASTER=60 + SLEEP_TIME_FOR_SECOND_MASTER=400 SLEEP_TIME_FOR_FIRST_SLAVE=400 -SLEEP_TIME_FOR_SECOND_SLAVE=30 +SLEEP_TIME_FOR_SECOND_SLAVE=60 diff --git a/mysql.spec b/mysql.spec index 60c56b3..0e6a417 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql -Version: 4.1.7 -Release: 10 +Version: 4.1.9 +Release: 1 Source0: http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-%{version}.tar.gz Source1: mysql.init Source2: mysql.logrotate @@ -357,6 +357,9 @@ fi %{_datadir}/sql-bench %changelog +* Sat Jan 15 2005 Tom Lane 4.1.9-1 +- Update to MySQL 4.1.9. + * Wed Jan 12 2005 Tom Lane 4.1.7-10 - Don't assume /etc/my.cnf will specify pid-file (bz#143724) diff --git a/sources b/sources index c030085..522c39d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04c08d2a5cc39050d9fa4727f8f197e8 mysql-4.1.7.tar.gz +7bc44befe155d619c4e4705f68874278 mysql-4.1.9.tar.gz