move status action to status function

[packages/mysql.git] / mysql-libs.patch

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 94a374b50978453e75ad46bb46f4b70b452f610c..ea6aa6c63e7026ac2e92fabbca9e4efa7ab12037 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- mysql-5.0.56/configure.in~ 2008-04-07 09:44:34.000000000 +0300
++++ mysql-5.0.56/configure.in  2008-04-07 12:23:29.657592515 +0300
+@@ -826,9 +826,9 @@
  
  AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
  
@@ -8,13 +8,12 @@
 -  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, ,
--  AC_CHECK_LIB(nsl, yp_get_default_domain))
- AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
+ AC_CHECK_FUNC(yp_get_default_domain, ,
+@@ -837,7 +837,11 @@
  # This may get things to compile even if bind-8 is installed
  AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
  # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
@@ -22,30 +21,19 @@
 +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"
+ # See if we need a library for address lookup.
+ AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
  
- # 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
- 
- libmysqlclient_r_la_SOURCES = $(target_sources)
--libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
-+libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) -lpthread
- 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
-@@ -44,7 +44,7 @@
+--- mysql-5.0.51/sql/Makefile.am~      2007-12-06 22:13:15.000000000 +0200
++++ mysql-5.0.51/sql/Makefile.am       2007-12-06 22:14:55.492574255 +0200
+@@ -43,7 +43,7 @@
                          @innodb_system_libs@ \
                        @ndbcluster_libs@ @ndbcluster_system_libs@ \
                        $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
--                        @yassl_libs@ @openssl_libs@
-+                        @yassl_libs@ @openssl_libs@ @LIBCRYPT@
+-                      $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
++                      $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ @LIBCRYPT@
+ 
  noinst_HEADERS =      item.h item_func.h item_sum.h item_cmpfunc.h \
                        item_strfunc.h item_timefunc.h item_uniq.h \
-                       item_create.h item_subselect.h item_row.h \