bk commit into 4.1 tree (jani:1.2492)

[jani]

Below is the list of changes that have just been committed into a local
4.1 repository of jani. When jani does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2492 05/12/13 18:30:10 jani@stripped +3 -0
  Minor Netware specific changes.

  sql/tztime.cc
    1.21 05/12/13 18:30:06 jani@stripped +5 -0
    Code not ported to Netware yet.

  scripts/make_binary_distribution.sh
    1.90 05/12/13 18:30:06 jani@stripped +4 -0
    Netware specific changes. Discard platform
    specific files and added a couple of missing files.

  netware/BUILD/compile-linux-tools
    1.8 05/12/13 18:30:06 jani@stripped +3 -2
    Fixed compilation problem with Linux tools.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-4.1

--- 1.89/scripts/make_binary_distribution.sh	2005-12-05 18:10:41 +02:00
+++ 1.90/scripts/make_binary_distribution.sh	2005-12-13 18:30:06 +02:00
@@ -177,6 +177,7 @@
       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 @@
         $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

--- 1.20/sql/tztime.cc	2005-06-05 20:38:42 +03:00
+++ 1.21/sql/tztime.cc	2005-12-13 18:30:06 +02:00
@@ -2359,6 +2359,7 @@
 int
 main(int argc, char **argv)
 {
+#ifndef __NETWARE__
   MY_INIT(argv[0]);
 
   if (argc != 2 && argc != 3)
@@ -2416,6 +2417,10 @@
 
     free_root(&tz_storage, MYF(0));
   }
+
+#else
+  fprintf(stderr, "This tool has not been ported to NetWare\n");
+#endif /* __NETWARE__ */
 
   return 0;
 }

--- 1.7/netware/BUILD/compile-linux-tools	2005-10-27 19:34:19 +03:00
+++ 1.8/netware/BUILD/compile-linux-tools	2005-12-13 18:30:06 +02:00
@@ -28,7 +28,8 @@
 ./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 @@
 # 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