- set collation to latin2-like, too.

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

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 0c0511dc4e638bed4ab89fe6514351b589220ccf..585048065ea6577a66a9cfb971f1488d8f91d05d 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,14 +1,54 @@
-diff -urN mysql-4.0.9-gamma.org/acinclude.m4 mysql-4.0.9-gamma/acinclude.m4
---- mysql-4.0.9-gamma.org/acinclude.m4 Mon Feb  3 23:34:15 2003
-+++ mysql-4.0.9-gamma/acinclude.m4     Tue Feb  4 00:11:55 2003
-@@ -715,6 +715,9 @@
-   if test -f $d/libssl.a ; then
-     OPENSSL_LIB=$d
-   fi
-+  if test -f $d/libssl.so ; then
-+    OPENSSL_LIB=$d
-+  fi
-  done
- 
-  if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then
-
+diff -urN mysql-4.1.7.org/configure.in mysql-4.1.7/configure.in
+--- 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 @@
+ 
+ AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
+ 
+-AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
+-  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_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))
+ # 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)
++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])) 
++LIBS="$save_LIBS"
+ 
+ # For sem_xxx functions on Solaris 2.6
+ AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
+diff -urN mysql-4.1.7.org/libmysql_r/Makefile.am mysql-4.1.7/libmysql_r/Makefile.am
+--- mysql-4.1.7.org/libmysql_r/Makefile.am     2004-10-27 01:35:55.265121136 +0200
++++ mysql-4.1.7/libmysql_r/Makefile.am 2004-10-27 01:36:23.574817408 +0200
+@@ -33,7 +33,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
+diff -urN mysql-4.1.7.org/sql/Makefile.am mysql-4.1.7/sql/Makefile.am
+--- 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
+@@ -43,7 +43,7 @@
+                       @bdb_libs@ @innodb_libs@ @pstack_libs@ \
+                         @innodb_system_libs@ \
+                       @ndbcluster_libs@ @ndbcluster_system_libs@ \
+-                      $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@
++                      $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_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 \