From b0626431808b30a4dac6f5442157ad878c8caa93 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 24 Oct 2006 13:12:34 +0200
Subject: [PATCH 1/2] Replace all refernces to .la libraries with direct
 references to their .libs/*.a library Add comment describing why mwldnlm is
 called with "x" flag

configure.in:
  Replace references to yassl .la libraries with direct reference to
  the .a libraries
netware/BUILD/mwldnlm:
  Add comment about why mwldnlm is called with the "x" flag and how
  to avoid it
---
 configure.in          | 4 ++++
 netware/BUILD/mwldnlm | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/configure.in b/configure.in
index 55da1dfb241..c050d31a917 100644
--- a/configure.in
+++ b/configure.in
@@ -1176,12 +1176,16 @@ EOF
           cat > $filesed << EOF
 s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
 s,\(: conf_to_src\),\1.linux,
+s,libyassl.la,.libs/libyassl.a,
+s,libtaocrypt.la,.libs/libtaocrypt.a,
 EOF
           ;;
         libmysql_r/Makefile.in)
           cat > $filesed << EOF
 s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
 s,\(: conf_to_src\),\1.linux,
+s,libyassl.la,.libs/libyassl.a,
+s,libtaocrypt.la,.libs/libtaocrypt.a,
 EOF
           ;;
         strings/Makefile.in)
diff --git a/netware/BUILD/mwldnlm b/netware/BUILD/mwldnlm
index cc8c9e63c6e..b1822827b59 100755
--- a/netware/BUILD/mwldnlm
+++ b/netware/BUILD/mwldnlm
@@ -3,6 +3,13 @@
 # stop on errors
 set -e
 
+# If libtool passes "x" as the first argument to this script
+# it's an indication that libtool is trying to unpack .la's
+# so they can be added to a new library
+# This step does not work on Netware and we avoid it by
+# replacing the .la library with the path to the .a library
+# in Makefile.in
+
 args=" $*"
 
 # NOTE: Option 'pipefail' is not standard sh

From 8b3f82322eafdd369861f52eaef95ee26780cf70 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 24 Oct 2006 13:52:50 +0200
Subject: [PATCH 2/2] Use same type for local variables as arguments, avoid
 compile error on NetWare

---
 client/mysqldump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 28a220bf61e..757bec09b50 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -1195,7 +1195,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg, const char* send,
                           const char* first_attribute_name, ...)
 {
   va_list arg_list;
-  char *attribute_name, *attribute_value;
+  const char *attribute_name, *attribute_value;
 
   fputs(sbeg, xml_file);
   fputc('<', xml_file);
@@ -1318,7 +1318,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
 static void print_blob_as_hex(FILE *output_file, const char *str, ulong len)
 {
     /* sakaik got the idea to to provide blob's in hex notation. */
-    char *ptr= str, *end= ptr + len;
+    const char *ptr= str, *end= ptr + len;
     for (; ptr < end ; ptr++)
       fprintf(output_file, "%02X", *((uchar *)ptr));
     check_io(output_file);