From 2e8dc5fff4a743627003ca96e3740ffc0ef757e8 Mon Sep 17 00:00:00 2001
From: unknown <jani@a193-229-222-105.elisa-laajakaista.fi>
Date: Tue, 13 Dec 2005 17:53:26 +0200
Subject: [PATCH 1/2] Increased stack size for clients on Netware. New libc
 suggests doing this.

---
 netware/libmysql.def          | 1 +
 netware/my_print_defaults.def | 1 +
 netware/myisamlog.def         | 1 +
 netware/myisampack.def        | 1 +
 netware/mysql.def             | 1 +
 netware/mysql_install_db.def  | 1 +
 netware/mysqladmin.def        | 1 +
 netware/mysqlbinlog.def       | 1 +
 netware/mysqlcheck.def        | 1 +
 netware/mysqld_safe.def       | 1 +
 netware/mysqldump.def         | 1 +
 netware/mysqlimport.def       | 1 +
 netware/perror.def            | 1 +
 13 files changed, 13 insertions(+)

diff --git a/netware/libmysql.def b/netware/libmysql.def
index 7804c4468a5..3d7d0b2f7fe 100644
--- a/netware/libmysql.def
+++ b/netware/libmysql.def
@@ -7,5 +7,6 @@ COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved
 DESCRIPTION "MySQL Client Library"
 VERSION 4, 0
 AUTOUNLOAD
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
diff --git a/netware/my_print_defaults.def b/netware/my_print_defaults.def
index 49f167341ae..a64d1fa5091 100644
--- a/netware/my_print_defaults.def
+++ b/netware/my_print_defaults.def
@@ -5,6 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Print Defaults Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisamlog.def b/netware/myisamlog.def
index 5c4cbb23361..b146b9c015e 100644
--- a/netware/myisamlog.def
+++ b/netware/myisamlog.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL MyISAM Table Log Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/myisampack.def b/netware/myisampack.def
index 9111538c2c0..1d82a314882 100644
--- a/netware/myisampack.def
+++ b/netware/myisampack.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL MyISAM Table Pack Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysql.def b/netware/mysql.def
index 6996bbb1f68..b1d8b51812b 100644
--- a/netware/mysql.def
+++ b/netware/mysql.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Monitor[scrollable]"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Monitor"
 VERSION 4, 0
+STACKSIZE 32768
 MULTIPLE
 XDCDATA ../netware/mysql.xdc
 #DEBUG
diff --git a/netware/mysql_install_db.def b/netware/mysql_install_db.def
index 4653638b5ad..0062b387090 100644
--- a/netware/mysql_install_db.def
+++ b/netware/mysql_install_db.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Install"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Initial Database Installer"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqladmin.def b/netware/mysqladmin.def
index 114d693585d..b5150795285 100644
--- a/netware/mysqladmin.def
+++ b/netware/mysqladmin.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Admin[scrollable]"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Admin Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqlbinlog.def b/netware/mysqlbinlog.def
index a2d7d12fb31..65b64a6346b 100644
--- a/netware/mysqlbinlog.def
+++ b/netware/mysqlbinlog.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Binary Log Dump Tool[scrollable]"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Binary Log Dump Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqlcheck.def b/netware/mysqlcheck.def
index 5dea92e7185..de182645ed4 100644
--- a/netware/mysqlcheck.def
+++ b/netware/mysqlcheck.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Check Tool[scrollable]"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Check Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqld_safe.def b/netware/mysqld_safe.def
index 9080ef783c9..4db276432a4 100644
--- a/netware/mysqld_safe.def
+++ b/netware/mysqld_safe.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Database Server"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Database Server Monitor"
 VERSION 4, 0
+STACKSIZE 32768
 MULTIPLE
 XDCDATA ../netware/mysql.xdc
 #DEBUG
diff --git a/netware/mysqldump.def b/netware/mysqldump.def
index aacc763930f..40d26f523cf 100644
--- a/netware/mysqldump.def
+++ b/netware/mysqldump.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Dump Tool[scrollable]"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Dump Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqlimport.def b/netware/mysqlimport.def
index 92f3f3690c6..9aa42da624c 100644
--- a/netware/mysqlimport.def
+++ b/netware/mysqlimport.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Import[scrollable]"
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Import Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/perror.def b/netware/perror.def
index f1d23715f55..52cdb36afbe 100644
--- a/netware/perror.def
+++ b/netware/perror.def
@@ -5,6 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Error Code Description Tool"
 VERSION 4, 0
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 

From 120466962061ba50d5de5326258c15848bcc2910 Mon Sep 17 00:00:00 2001
From: unknown <jani@a193-229-222-105.elisa-laajakaista.fi>
Date: Tue, 13 Dec 2005 18:30:10 +0200
Subject: [PATCH 2/2] Minor Netware specific changes.

netware/BUILD/compile-linux-tools:
  Fixed compilation problem with Linux tools.
scripts/make_binary_distribution.sh:
  Netware specific changes. Discard platform
  specific files and added a couple of missing files.
sql/tztime.cc:
  Code not ported to Netware yet.
---
 netware/BUILD/compile-linux-tools   | 5 +++--
 scripts/make_binary_distribution.sh | 4 ++++
 sql/tztime.cc                       | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools
index 744bb1d4c3d..c67830be7ed 100755
--- a/netware/BUILD/compile-linux-tools
+++ b/netware/BUILD/compile-linux-tools
@@ -28,7 +28,8 @@ rm -f */*.linux
 ./configure --without-innodb --without-docs
 
 # build	tools only
-make clean all-local
+make clean
+make
 (cd dbug; make libdbug.a)
 (cd strings; make libmystrings.a)
 (cd mysys; make libmysys.a)
@@ -53,7 +54,7 @@ make clean all-local
 # copying required linux tools
 cp extra/comp_err extra/comp_err.linux
 cp libmysql/conf_to_src libmysql/conf_to_src.linux
-cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
+#cp libmysql_r/conf_to_src libmysql_r/conf_to_src.linux
 cp sql/gen_lex_hash sql/gen_lex_hash.linux
 cp strings/conf_to_src strings/conf_to_src.linux
 
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index c00ba1c6f57..3c16937e158 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -177,6 +177,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
       libname=`basename $i .a`
       $MV $i $BASE/lib/$libname.lib
     done
+    rm -f $BASE/lib/*.la
 fi
 
 copyfileto $BASE/include config.h include/*
@@ -266,6 +267,9 @@ if [ $BASE_SYSTEM = "netware" ] ; then
         $BASE/support-files/mysql*.spec \
         $BASE/support-files/mysql-log-rotate \
         $BASE/support-files/binary-configure \
+        $BASE/support-files/build-tags \
+	$BASE/support-files/MySQL-shared-compat.spec \
+        $BASE/support-files/ndb-config-2-node.ini \
         $BASE/INSTALL-BINARY \
         $BASE/MySQLEULA.txt
 else
diff --git a/sql/tztime.cc b/sql/tztime.cc
index b5ebc9f350a..b0a32748998 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -2359,6 +2359,7 @@ scan_tz_dir(char * name_end)
 int
 main(int argc, char **argv)
 {
+#ifndef __NETWARE__
   MY_INIT(argv[0]);
 
   if (argc != 2 && argc != 3)
@@ -2417,6 +2418,10 @@ main(int argc, char **argv)
     free_root(&tz_storage, MYF(0));
   }
 
+#else
+  fprintf(stderr, "This tool has not been ported to NetWare\n");
+#endif /* __NETWARE__ */
+
   return 0;
 }