- updated to 5.0.24

Changed files:
    mysql-fix_privilege_tables.patch -> 1.7
    mysql-libs.patch -> 1.14

diff --git a/mysql-fix_privilege_tables.patch b/mysql-fix_privilege_tables.patch
index 671a27334f9b1b993b5a5cf0ff3972156ed81201..077e2cdcf7620560bb9e75879cc82b3c5232c462 100644 (file)
--- a/mysql-fix_privilege_tables.patch
+++ b/mysql-fix_privilege_tables.patch
@@ -1,4 +1,3 @@
-diff -urN mysql-4.1.7.org/scripts/mysql_fix_privilege_tables.sh mysql-4.1.7/scripts/mysql_fix_privilege_tables.sh
 --- mysql-4.1.7.org/scripts/mysql_fix_privilege_tables.sh      2004-10-27 01:35:56.000000000 +0200
 +++ mysql-4.1.7/scripts/mysql_fix_privilege_tables.sh  2004-10-27 12:13:42.159439392 +0200
 @@ -5,7 +5,7 @@
@@ -10,8 +9,8 @@ diff -urN mysql-4.1.7.org/scripts/mysql_fix_privilege_tables.sh mysql-4.1.7/scri
  sql_only=0
  basedir=""
  verbose=0
---- mysql-5.0.19/scripts/mysql_upgrade.sh~     2006-03-04 22:35:13.000000000 +0200
-+++ mysql-5.0.19/scripts/mysql_upgrade.sh      2006-03-12 22:52:55.000000000 +0200
+--- mysql-5.0.19/scripts/mysql_upgrade_shell.sh~       2006-03-04 22:35:13.000000000 +0200
++++ mysql-5.0.24/scripts/mysql_upgrade_shell.sh        2006-03-12 22:52:55.000000000 +0200
 @@ -13,7 +13,7 @@
  # arguments as these needs to be passed on to the mysqlcheck command
  

diff --git a/mysql-libs.patch b/mysql-libs.patch
index fba7838502903ee3cca3b6df2d186ce69a93978e..94a374b50978453e75ad46bb46f4b70b452f610c 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,6 +1,6 @@
---- mysql-4.1.7.org/configure.in       2004-10-27 01:35:54.930172056 +0200
-+++ mysql-4.1.7/configure.in   2004-10-27 01:39:04.368373072 +0200
-@@ -779,19 +779,20 @@
+--- mysql-5.0.24/configure.in~ 2006-08-07 01:15:28.845040985 +0300
++++ mysql-5.0.24/configure.in  2006-08-07 02:06:21.203404560 +0300
+@@ -737,18 +737,20 @@
  
  AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
  
@@ -17,12 +17,12 @@
  AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
  # This may get things to compile even if bind-8 is installed
  AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
- # For crypt() on Linux
--AC_CHECK_LIB(crypt, crypt)
+ # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
+-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
 +save_LIBS="$LIBS"
 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
 +AC_SUBST(LIBCRYPT)
- AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) 
++AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) 
 +LIBS="$save_LIBS"
  
  # For sem_xxx functions on Solaris 2.6