From fa98cf328f1d11486689ece0418a7c2a274186a0 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 2 May 2006 03:37:40 +0000 Subject: [PATCH] Update to MySQL 5.0.21. --- .cvsignore | 2 +- mysql-install-test.patch | 48 +++++++++++++++++++++------------------- mysql-libdir.patch | 17 +++++++------- mysql-no-atomic.patch | 14 +++++++----- mysql.spec | 10 +++++++-- sources | 2 +- 6 files changed, 53 insertions(+), 40 deletions(-) diff --git a/.cvsignore b/.cvsignore index c56ca66..122ca1e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-5.0.18.tar.gz +mysql-5.0.21.tar.gz diff --git a/mysql-install-test.patch b/mysql-install-test.patch index 075b469..b375e91 100644 --- a/mysql-install-test.patch +++ b/mysql-install-test.patch @@ -4,12 +4,12 @@ like /usr/share/mysql-test, we have to hack up the paths in install_test_db and mysql-test-run. This patch also improves the documentation a tad. -diff -Naur mysql-5.0.18.orig/mysql-test/README mysql-5.0.18/mysql-test/README ---- mysql-5.0.18.orig/mysql-test/README 2005-12-21 14:39:48.000000000 -0500 -+++ mysql-5.0.18/mysql-test/README 2006-03-09 20:29:24.000000000 -0500 -@@ -2,11 +2,20 @@ - the currently existing test cases, simply execute ./mysql-test-run in - this directory. It will fire up the newly built mysqld and test it. +diff -Naur mysql-5.0.21.orig/mysql-test/README mysql-5.0.21/mysql-test/README +--- mysql-5.0.21.orig/mysql-test/README 2006-04-26 14:31:03.000000000 -0400 ++++ mysql-5.0.21/mysql-test/README 2006-05-01 20:58:04.000000000 -0400 +@@ -6,6 +6,14 @@ + actually have a co-existing MySQL installation. The tests will not + conflict with it. +For use in Red Hat distributions, you should run the script as user mysql, +so the best bet is something like @@ -19,20 +19,22 @@ diff -Naur mysql-5.0.18.orig/mysql-test/README mysql-5.0.18/mysql-test/README +of the server process (using data files within /usr/share/mysql-test), +so you need not start the mysqld service beforehand. + - If you want to run a test with a running MySQL server use the --extern - option to mysql-test-run. Please note that in this mode the test suite - expects user to specify test names to run. Otherwise it falls back to the --normal "non-extern" behaviour. The reason is that some tests --could not run with external server. Here is the sample command -+normal "non-extern" behaviour. The reason is that many tests -+will fail with external server (because they need to control the options -+with which the server is started). Here is the sample command - to test "alias" and "analyze" tests on external server: + All tests must pass. If one or more of them fail on your system, please + read the following manual section for instructions on how to report the + problem: +@@ -25,7 +33,8 @@ - mysql-test-run --extern alias analyze -diff -Naur mysql-5.0.18.orig/mysql-test/install_test_db.sh mysql-5.0.18/mysql-test/install_test_db.sh ---- mysql-5.0.18.orig/mysql-test/install_test_db.sh 2005-12-21 14:39:48.000000000 -0500 -+++ mysql-5.0.18/mysql-test/install_test_db.sh 2006-03-09 20:20:45.000000000 -0500 + With no test cases named on the command line, mysql-test-run falls back + to the normal "non-extern" behavior. The reason for this is that some +-tests cannot run with an external server. ++tests cannot run with an external server (because they need to control the ++options with which the server is started). + + + You can create your own test cases. To create a test case, create a new +diff -Naur mysql-5.0.21.orig/mysql-test/install_test_db.sh mysql-5.0.21/mysql-test/install_test_db.sh +--- mysql-5.0.21.orig/mysql-test/install_test_db.sh 2006-04-26 14:31:03.000000000 -0400 ++++ mysql-5.0.21/mysql-test/install_test_db.sh 2006-05-01 20:56:05.000000000 -0400 @@ -9,17 +9,17 @@ shift 1 @@ -67,10 +69,10 @@ diff -Naur mysql-5.0.18.orig/mysql-test/install_test_db.sh mysql-5.0.18/mysql-te else basedir=. EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/" -diff -Naur mysql-5.0.18.orig/mysql-test/mysql-test-run.sh mysql-5.0.18/mysql-test/mysql-test-run.sh ---- mysql-5.0.18.orig/mysql-test/mysql-test-run.sh 2005-12-21 14:39:59.000000000 -0500 -+++ mysql-5.0.18/mysql-test/mysql-test-run.sh 2006-03-09 20:20:45.000000000 -0500 -@@ -693,6 +693,8 @@ +diff -Naur mysql-5.0.21.orig/mysql-test/mysql-test-run.sh mysql-5.0.21/mysql-test/mysql-test-run.sh +--- mysql-5.0.21.orig/mysql-test/mysql-test-run.sh 2006-04-26 14:31:05.000000000 -0400 ++++ mysql-5.0.21/mysql-test/mysql-test-run.sh 2006-05-01 20:56:05.000000000 -0400 +@@ -740,6 +740,8 @@ # currently all binaries are in "bin", for a MySQL AB packaging # some are in "tests". diff --git a/mysql-libdir.patch b/mysql-libdir.patch index b6983d2..7c2b488 100644 --- a/mysql-libdir.patch +++ b/mysql-libdir.patch @@ -1,11 +1,12 @@ -diff -Naur mysql-4.1.7-orig/scripts/mysql_config.sh mysql-4.1.7/scripts/mysql_config.sh ---- mysql-4.1.7-orig/scripts/mysql_config.sh 2004-10-23 03:28:44.000000000 -0400 -+++ mysql-4.1.7/scripts/mysql_config.sh 2004-10-27 21:15:48.762963874 -0400 -@@ -75,7 +75,6 @@ - execdir='@libexecdir@' - bindir='@bindir@' +diff -Naur mysql-5.0.21.orig/scripts/mysql_config.sh mysql-5.0.21/scripts/mysql_config.sh +--- mysql-5.0.21.orig/scripts/mysql_config.sh 2006-04-26 14:30:47.000000000 -0400 ++++ mysql-5.0.21/scripts/mysql_config.sh 2006-05-01 20:45:42.000000000 -0400 +@@ -85,8 +85,6 @@ + + # If installed, search for the compiled in directory first (might be "lib64") pkglibdir='@pkglibdir@' --fix_path pkglibdir lib/mysql lib +-pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` +-fix_path pkglibdir $pkglibdir_rel lib/mysql lib + pkgincludedir='@pkgincludedir@' fix_path pkgincludedir include/mysql include - version='@VERSION@' diff --git a/mysql-no-atomic.patch b/mysql-no-atomic.patch index 0a1cb4a..50bcba5 100644 --- a/mysql-no-atomic.patch +++ b/mysql-no-atomic.patch @@ -4,15 +4,18 @@ which is we avoid the 4-vs-8-byte problem in BDB that formerly required mysql-threads.patch. -diff -Naur mysql-4.1.12.orig/configure.in mysql-4.1.12/configure.in ---- mysql-4.1.12.orig/configure.in 2005-05-13 07:32:33.000000000 -0400 -+++ mysql-4.1.12/configure.in 2005-07-11 12:16:28.000000000 -0400 -@@ -862,43 +862,6 @@ +diff -Naur mysql-5.0.21.orig/configure.in mysql-5.0.21/configure.in +--- mysql-5.0.21.orig/configure.in 2006-04-26 14:31:03.000000000 -0400 ++++ mysql-5.0.21/configure.in 2006-05-01 20:52:08.000000000 -0400 +@@ -803,47 +803,6 @@ AC_SUBST(WRAPLIBS) if test "$TARGET_LINUX" = "true"; then - AC_MSG_CHECKING([for atomic operations]) - +- AC_LANG_SAVE +- AC_LANG_CPLUSPLUS +- - atom_ops= - AC_TRY_RUN([ -#include @@ -48,6 +51,7 @@ diff -Naur mysql-4.1.12.orig/configure.in mysql-4.1.12/configure.in - if test -z "$atom_ops"; then atom_ops="no"; fi - AC_MSG_RESULT($atom_ops) - +- AC_LANG_RESTORE + AC_ARG_WITH(pstack, [ --with-pstack Use the pstack backtrace library], - [ USE_PSTACK=$withval ], diff --git a/mysql.spec b/mysql.spec index d4a801c..780bf7a 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql -Version: 5.0.18 -Release: 4 +Version: 5.0.21 +Release: 1 Summary: MySQL client programs and shared libraries. License: GPL Group: Applications/Databases @@ -343,6 +343,7 @@ fi %{_bindir}/mysql_secure_installation %{_bindir}/mysql_setpermission %{_bindir}/mysql_tzinfo_to_sql +%{_bindir}/mysql_upgrade %{_bindir}/mysql_zap %{_bindir}/mysqlbug %{_bindir}/mysqld_multi @@ -364,9 +365,11 @@ fi %{_mandir}/man1/myisamchk.1.gz %{_mandir}/man1/myisamlog.1.gz %{_mandir}/man1/myisampack.1.gz +%{_mandir}/man1/myisam_ftdump.1.gz %{_mandir}/man1/mysql.server.1.gz %{_mandir}/man1/mysql_config.1.gz %{_mandir}/man1/mysql_fix_privilege_tables.1* +%{_mandir}/man1/mysql_upgrade.1* %{_mandir}/man1/mysql_zap.1* %{_mandir}/man1/mysqlbinlog.1.gz %{_mandir}/man1/mysqlcheck.1.gz @@ -407,6 +410,9 @@ fi %attr(-,mysql,mysql) %{_datadir}/mysql-test %changelog +* Mon May 1 2006 Tom Lane 5.0.21-1 +- Update to MySQL 5.0.21 + * Mon Mar 27 2006 Tom Lane 5.0.18-4 - Modify multilib header hack to not break non-RH arches, per bug #181335 - Remove logrotate script, per bug #180639. diff --git a/sources b/sources index 59b71ac..f7788b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz +c3165204c42e1db6fc3a95a4fd2cd22f mysql-5.0.21.tar.gz