- updated for .33

Changed files:
    mysql-libs.patch -> 1.24
    mysql-userstats.patch -> 1.4

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 4ada9b725bf54847818c97cfa4532cdfb463b349..bbca817343d3b565889cc2b2d950022e12c3b307 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,24 +1,21 @@
 --- mysql-5.1.21-beta/configure.in~    2007-08-29 19:00:29.000000000 +0300
 +++ mysql-5.1.21-beta/configure.in     2007-08-29 19:00:35.000000000 +0300
-@@ -839,18 +839,20 @@
+@@ -836,8 +836,9 @@
  
  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(gethostbyname_r, [], [
++ AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
++  AC_CHECK_LIB(nsl, gethostbyname_r)) ])
+ AC_CHECK_FUNC(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))
+ AC_SEARCH_LIBS(setsockopt, socket)
+@@ -845,6 +846,11 @@
+ AC_SEARCH_LIBS(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(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
 +save_LIBS="$LIBS"
 +AC_CHECK_LIB(crypt, crypt, [LIBS="-lcrypt $LIBS"; LIBCRYPT="-lcrypt"])
 +AC_SUBST(LIBCRYPT)

diff --git a/mysql-userstats.patch b/mysql-userstats.patch
index 2d3e07b3902664845b0159b4dca0e36a46abb35d..e896c081c825f00848fba3661b920fc8e00208b0 100644 (file)
--- a/mysql-userstats.patch
+++ b/mysql-userstats.patch
@@ -399,9 +399,9 @@ diff -r ab66c8ca382a sql/sql_class.cc
  #ifndef DBUG_OFF
    dbug_sentry=THD_SENTRY_MAGIC;
 @@ -761,8 +763,55 @@
-   update_charset();
    reset_current_stmt_binlog_row_based();
    bzero((char *) &status_var, sizeof(status_var));
+   sql_log_bin_toplevel= options & OPTION_BIN_LOG;
 +  reset_stats();
  }