- updated to 5.0.19

Changed files:
    mysql-client-config.patch -> 1.3
    mysql-libs.patch -> 1.12

diff --git a/mysql-client-config.patch b/mysql-client-config.patch
index e0466d1fef4665a740cc109b25f38178cc94cbff..662ffa13454e30fc4657c7dd88e825398ced2f69 100644 (file)
--- a/mysql-client-config.patch
+++ b/mysql-client-config.patch
@@ -1,33 +1,30 @@
-diff -urbB mysql-5.0.13-rc.org/libmysqld/client.c mysql-5.0.13-rc/libmysqld/client.c
---- mysql-5.0.13-rc.org/libmysqld/client.c     2005-09-22 21:40:24.000000000 +0200
-+++ mysql-5.0.13-rc/libmysqld/client.c 2005-09-29 19:35:27.947950000 +0200
-@@ -1455,6 +1455,7 @@
+--- mysql-5.1.6-alpha/libmysqld/client.c~      2006-02-21 16:09:31.000000000 +0200
++++ mysql-5.1.6-alpha/libmysqld/client.c       2006-02-21 16:11:30.000000000 +0200
+@@ -1456,6 +1456,7 @@
  
    mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
    mysql->options.report_data_truncation= TRUE;  /* default */
 +  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-   return mysql;
- }
  
-diff -urbB mysql-5.0.13-rc.org/sql/client.c mysql-5.0.13-rc/sql/client.c
---- mysql-5.0.13-rc.org/sql/client.c   2005-09-22 21:40:24.000000000 +0200
-+++ mysql-5.0.13-rc/sql/client.c       2005-09-29 19:35:38.164588500 +0200
-@@ -1455,6 +1455,7 @@
+   /*
+     By default we don't reconnect because it could silently corrupt data (after
+--- mysql-5.1.6-alpha/sql/client.c~    2006-02-21 16:09:32.000000000 +0200
++++ mysql-5.1.6-alpha/sql/client.c     2006-02-21 16:12:13.000000000 +0200
+@@ -1456,6 +1456,7 @@
  
    mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
    mysql->options.report_data_truncation= TRUE;  /* default */
 +  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-   return mysql;
- }
  
-diff -urbB mysql-5.0.13-rc.org/sql-common/client.c mysql-5.0.13-rc/sql-common/client.c
---- mysql-5.0.13-rc.org/sql-common/client.c    2005-09-22 21:40:24.000000000 +0200
-+++ mysql-5.0.13-rc/sql-common/client.c        2005-09-29 19:35:54.881633250 +0200
-@@ -1455,6 +1455,7 @@
+   /*
+     By default we don't reconnect because it could silently corrupt data (after
+--- mysql-5.1.6-alpha/sql-common/client.c~     2006-02-21 16:09:34.000000000 +0200
++++ mysql-5.1.6-alpha/sql-common/client.c      2006-02-21 16:14:10.000000000 +0200
+@@ -1456,6 +1456,7 @@
  
    mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
    mysql->options.report_data_truncation= TRUE;  /* default */
 +  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-   return mysql;
- }
  
+   /*
+     By default we don't reconnect because it could silently corrupt data (after

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 3bb31a171c236471aef04a25e326364778911013..2461e627ba95c11fbdf8364aa2d017afc01ac6cd 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -28,15 +28,14 @@ diff -urN mysql-4.1.7.org/configure.in mysql-4.1.7/configure.in
  
  # 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 @@
+--- mysql-5.0.19-nightly-20060111/libmysql_r/Makefile.am~      2006-01-13 12:17:05.000000000 +0200
++++ mysql-5.0.19-nightly-20060111/libmysql_r/Makefile.am       2006-01-13 12:17:50.000000000 +0200
+@@ -32,7 +32,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_LIBADD = $(target_libadd) $(yassl_libs_with_path)
++libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) -lpthread
  libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
  
  # This is called from the toplevel makefile