Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new mysql-test/r/innodb.result: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/ndb_read_multi_range.test: Auto merged sql/ha_innodb.cc: Auto merged storage/innobase/dict/dict0dict.c: Auto merged storage/innobase/dict/dict0load.c: Auto merged storage/innobase/include/dict0dict.h: Auto merged storage/innobase/include/dict0load.h: Auto merged storage/innobase/include/os0file.h: Auto merged storage/innobase/include/rem0cmp.h: Auto merged storage/innobase/include/srv0srv.h: Auto merged storage/innobase/rem/rem0cmp.c: Auto merged storage/innobase/row/row0ins.c: Auto merged storage/innobase/row/row0mysql.c: Auto merged storage/innobase/srv/srv0srv.c: Auto merged storage/innobase/srv/srv0start.c: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/ndb_version.h.in: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged support-files/mysql.spec.sh: Auto merged configure.in: Merged from 4.1
2025-02-02 12:01:42 +01:00 · 2005-12-14 01:29:39 +02:00 · 2005-12-14 01:29:39 +02:00 · 73b9175ce2
commit 73b9175ce2
parent 2d35684e7f 33c8e43a4a
15 changed files with 24 additions and 4 deletions
--- 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

--- 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
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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

--- 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
--- 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;
 }