SOURCES (MYSQL_5_0): mysql-libs.patch - updated

[arekm]

Author: arekm                        Date: Thu May 10 13:05:28 2007 GMT
Module: SOURCES                       Tag: MYSQL_5_0
---- Log message:
- updated

---- Files affected:
SOURCES:
   mysql-libs.patch (1.14.2.1 -> 1.14.2.2) 

---- Diffs:

================================================================
Index: SOURCES/mysql-libs.patch
diff -u SOURCES/mysql-libs.patch:1.14.2.1 SOURCES/mysql-libs.patch:1.14.2.2
--- SOURCES/mysql-libs.patch:1.14.2.1	Fri Mar  9 11:28:44 2007
+++ SOURCES/mysql-libs.patch	Thu May 10 15:05:23 2007
@@ -1,6 +1,7 @@
---- 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 @@
+diff -ur mysql-5.0.41.org/configure.in mysql-5.0.41/configure.in
+--- mysql-5.0.41.org/configure.in	2007-05-02 16:39:58.000000000 +0200
++++ mysql-5.0.41/configure.in	2007-05-10 15:02:12.075664162 +0200
+@@ -779,19 +779,20 @@
  
  AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
  
@@ -8,8 +9,8 @@
 -  AC_CHECK_LIB(nsl, gethostbyname_r))
 -AC_CHECK_FUNC(gethostbyname_r)
 +AC_CHECK_FUNC(gethostbyname_r, [],
-+  [AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
-+     [AC_CHECK_LIB(nsl, gethostbyname_r)])])
++	[AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
++		[AC_CHECK_LIB(nsl, gethostbyname_r)])])
  
  AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
 -AC_CHECK_FUNC(yp_get_default_domain, ,
@@ -19,18 +20,20 @@
  AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
  # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
 -AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
+-AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
 +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
- AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
---- mysql-5.0.21/libmysql_r/Makefile.am~	2006-05-02 16:55:15.179229923 +0300
-+++ mysql-5.0.21/libmysql_r/Makefile.am	2006-05-02 16:56:08.080408785 +0300
-@@ -32,7 +32,7 @@
- libmysql_dir = $(top_srcdir)/libmysql
+ # For the sched_yield() function on Solaris
+ AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))
+diff -ur mysql-5.0.41.org/libmysql_r/Makefile.am mysql-5.0.41/libmysql_r/Makefile.am
+--- mysql-5.0.41.org/libmysql_r/Makefile.am	2007-05-02 16:39:59.000000000 +0200
++++ mysql-5.0.41/libmysql_r/Makefile.am	2007-05-10 15:00:11.721844431 +0200
+@@ -30,7 +30,7 @@
+ include $(top_srcdir)/libmysql/Makefile.shared
  
  libmysqlclient_r_la_SOURCES = $(target_sources)
 -libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
@@ -38,8 +41,9 @@
  libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
  
  # This is called from the toplevel makefile
---- mysql-4.1.7.org/sql/Makefile.am	2004-10-27 01:35:55.971013824 +0200
-+++ mysql-4.1.7/sql/Makefile.am	2004-10-27 01:37:07.260176224 +0200
+diff -ur mysql-5.0.41.org/sql/Makefile.am mysql-5.0.41/sql/Makefile.am
+--- mysql-5.0.41.org/sql/Makefile.am	2007-05-02 16:40:42.000000000 +0200
++++ mysql-5.0.41/sql/Makefile.am	2007-05-10 15:00:11.721844431 +0200
 @@ -43,7 +43,7 @@
                          @innodb_system_libs@ \
  			@ndbcluster_libs@ @ndbcluster_system_libs@ \
@@ -49,4 +53,3 @@
  
  noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
  			item_strfunc.h item_timefunc.h item_uniq.h \
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mysql-libs.patch?r1=1.14.2.1&r2=1.14.2.2&f=u