- updated for 4.1.23

Changed files:
    mysql-client-config.patch -> 1.1.4.1
    mysql-libs.patch -> 1.10.2.1.2.1

diff --git a/mysql-client-config.patch b/mysql-client-config.patch
index 3f191fcf23bbbf682eabe6972a9d9c29ee25a3e6..87e188a650b776f1de1977f6cd231c8359b344f2 100644 (file)
--- a/mysql-client-config.patch
+++ b/mysql-client-config.patch
@@ -1,31 +1,3 @@
-diff -urN mysql-4.1.12.org/libmysqld/client.c mysql-4.1.12/libmysqld/client.c
---- mysql-4.1.12.org/libmysqld/client.c        2005-05-13 13:32:04.000000000 +0200
-+++ mysql-4.1.12/libmysqld/client.c    2005-07-09 16:20:39.539684568 +0200
-@@ -1447,6 +1447,10 @@
- #endif
- 
-   mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
-+
-+
-+  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-+        
-   return mysql;
- }
- 
-diff -urN mysql-4.1.12.org/sql/client.c mysql-4.1.12/sql/client.c
---- mysql-4.1.12.org/sql/client.c      2005-05-13 13:32:04.000000000 +0200
-+++ mysql-4.1.12/sql/client.c  2005-07-09 16:20:44.317958160 +0200
-@@ -1447,6 +1447,10 @@
- #endif
- 
-   mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
-+
-+  
-+  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
-+        
-   return mysql;
- }
- 
 diff -urN mysql-4.1.12.org/sql-common/client.c mysql-4.1.12/sql-common/client.c
 --- mysql-4.1.12.org/sql-common/client.c       2005-05-13 13:32:04.000000000 +0200
 +++ mysql-4.1.12/sql-common/client.c   2005-07-09 16:20:48.267357760 +0200

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 7b8120a124912fcce0f51bd26ed526302d841287..cb0a9769a0b64be23553a753b094b6a6214e8cb5 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -44,8 +44,8 @@
                        @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@
+-                      $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ \
++                      $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ @LIBCRYPT@ \
+                       @MYSQLD_EXTRA_LIBS@
  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 \