Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


netware/libmysql.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/perror.def:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/tztime.cc:
  Auto merged
netware/BUILD/compile-linux-tools:
  Merged from 4.1
netware/my_print_defaults.def:
  Merged from 4.1
netware/mysqladmin.def:
  Merged from 4.1

15 files changed, 24 insertions, 4 deletions

diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools
index 26ac1d79f37..14422ea5a3f 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
 
 # Create mysql_version.h which was deleted my previous step
 ./config.status include/mysql_version.h
@@ -55,7 +56,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/netware/libmysql.def b/netware/libmysql.def
index fea117dedd1..8a34754e092 100644
--- a/netware/libmysql.def
+++ b/netware/libmysql.def
@@ -7,5 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
 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 d88c5adf4cc..778a5204ebd 100644
--- a/netware/my_print_defaults.def
+++ b/netware/my_print_defaults.def
@@ -4,7 +4,7 @@
 MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Print Defaults Tool"
-VERSION 5, 0, 8
+VERSION 5, 0, 17
 STACKSIZE 32767
 XDCDATA ../netware/mysql.xdc
 #DEBUG
diff --git a/netware/myisamlog.def b/netware/myisamlog.def
index 3580c870c10..553a818a2ae 100644
--- a/netware/myisamlog.def
+++ b/netware/myisamlog.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool"
 COPYRIGHT "(c) 2003-2005 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 a6946982236..d1f85fe03f8 100644
--- a/netware/myisampack.def
+++ b/netware/myisampack.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool"
 COPYRIGHT "(c) 2003-2005 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_install_db.def b/netware/mysql_install_db.def
index 1657b7c17af..372bbf15570 100644
--- a/netware/mysql_install_db.def
+++ b/netware/mysql_install_db.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Install"
 COPYRIGHT "(c) 2003-2005 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 e7f2d90bf9e..6532cab84a0 100644
--- a/netware/mysqladmin.def
+++ b/netware/mysqladmin.def
@@ -6,7 +6,7 @@ SCREENNAME "MySQL Admin[scrollable]"
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL Admin Tool"
 VERSION 4, 0
-STACKSIZE 32767
+STACKSIZE 32768
 XDCDATA ../netware/mysql.xdc
 #DEBUG
 
diff --git a/netware/mysqlbinlog.def b/netware/mysqlbinlog.def
index 3e75cf07a57..aced63429c5 100644
--- a/netware/mysqlbinlog.def
+++ b/netware/mysqlbinlog.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Binary Log Dump Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 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 cb70c1b394d..1b90b2a1dbe 100644
--- a/netware/mysqlcheck.def
+++ b/netware/mysqlcheck.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Check Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 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 2a9ef04b47d..ff3f1924906 100644
--- a/netware/mysqld_safe.def
+++ b/netware/mysqld_safe.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Database Server"
 COPYRIGHT "(c) 2003-2005 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 811c53ce5f6..5d7999c789f 100644
--- a/netware/mysqldump.def
+++ b/netware/mysqldump.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Dump Tool[scrollable]"
 COPYRIGHT "(c) 2003-2005 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 dc9af18aa09..f98d8021a73 100644
--- a/netware/mysqlimport.def
+++ b/netware/mysqlimport.def
@@ -6,6 +6,7 @@ SCREENNAME "MySQL Import[scrollable]"
 COPYRIGHT "(c) 2003-2005 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 18c95d8b236..d67bd6191b4 100644
--- a/netware/perror.def
+++ b/netware/perror.def
@@ -5,6 +5,7 @@ MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 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
 
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 5767728fe4f..d4d96d38d14 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -193,6 +193,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/*
@@ -288,6 +289,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 e73d3f237ad..3a9d9a60aed 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -2443,6 +2443,7 @@ scan_tz_dir(char * name_end)
 int
 main(int argc, char **argv)
 {
+#ifndef __NETWARE__
   MY_INIT(argv[0]);
 
   if (argc != 2 && argc != 3)
@@ -2501,6 +2502,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;
 }