move status action to status function

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

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 4acd696feca26cf0fdfea8383c7d09572d072d3c..ea6aa6c63e7026ac2e92fabbca9e4efa7ab12037 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,6 +1,6 @@
---- mysql-4.0.15/configure.in.orig     2003-10-04 13:29:18.000000000 +0200
-+++ mysql-4.0.15/configure.in  2003-10-04 13:46:50.506700624 +0200
-@@ -746,19 +746,21 @@
+--- 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,45 +8,32 @@
 -  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))
- # 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"
-+LIBCRYPT=
 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
 +AC_SUBST(LIBCRYPT)
- AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_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-4.0.15/libmysql_r/Makefile.am.orig   2003-10-04 13:29:16.000000000 +0200
-+++ mysql-4.0.15/libmysql_r/Makefile.am        2003-10-04 13:47:15.957831464 +0200
-@@ -30,7 +30,7 @@
- libmysql_dir = $(top_srcdir)/libmysql
- 
- libmysqlclient_r_la_SOURCES = $(target_sources)
--libmysqlclient_r_la_LIBADD = $(target_libadd)
-+libmysqlclient_r_la_LIBADD = $(target_libadd) -lpthread
- libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
- 
- # This is called from the toplevel makefile
---- mysql-4.0.15/sql/Makefile.am.orig  2003-09-06 08:35:50.000000000 +0200
-+++ mysql-4.0.15/sql/Makefile.am       2003-10-04 13:47:34.660988152 +0200
+--- 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 @@
- mysqld_LDADD =                @MYSQLD_EXTRA_LDFLAGS@ \
-                       @bdb_libs@ @innodb_libs@ @pstack_libs@ \
                          @innodb_system_libs@ \
--                      $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
-+                      $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@
+                       @ndbcluster_libs@ @ndbcluster_system_libs@ \
+                       $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
+-                      $(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 mysql_priv.h \