bk commit into 4.0 tree (bldsql:1.2106)

[bldsql.blr.novell.com]

Below is the list of changes that have just been committed into a local
4.0 repository of bldsql. When bldsql 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.2106 05/08/05 17:04:40 bldsql@stripped +4 -0
  version change

  configure.in
    1.330 05/08/05 17:04:36 bldsql@stripped +0 -1
    version change

  scripts/make_binary_distribution.sh
    1.63 05/08/05 16:59:44 bldsql@stripped +0 -0
    Auto merged

  myisam/myisampack.c
    1.36 05/08/05 16:59:43 bldsql@stripped +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.334 05/08/05 16:59:25 bldsql@stripped +0 -0
    auto-union

# 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:	bldsql
# Host:	blr-naas-nwl03.blr.novell.com
# Root:	/home/bldsql/bk/Sawtooth_sp1/RESYNC

--- 1.35/myisam/myisampack.c	2005-04-28 18:57:40 +05:30
+++ 1.36/myisam/myisampack.c	2005-08-05 16:59:43 +05:30
@@ -234,7 +234,7 @@
 #endif
 }
 
-enum options_mp {OPT_CHARSETS_DIR_MP=256};
+enum options_mp {OPT_CHARSETS_DIR_MP=256, OPT_AUTOCLOSE};
 
 static struct my_option my_long_options[] =
 {
@@ -243,6 +243,10 @@
   {"character-sets-dir", OPT_CHARSETS_DIR_MP,
    "Directory where character sets are.", (gptr*) &charsets_dir,
    (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef __NETWARE__
+  {"autoclose", OPT_AUTOCLOSE, "Auto close the screen on exit for NetWare.", 0, 0, 0,
GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+#endif
   {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'",
    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"force", 'f',
@@ -305,6 +309,11 @@
   uint length;
 
   switch(optid) {
+  case OPT_AUTOCLOSE:
+#ifdef __NETWARE__
+    setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
+#endif
+    break;
   case 'f':
     force_pack= 1;
     tmpfile_createflag= O_RDWR | O_TRUNC;

--- 1.62/scripts/make_binary_distribution.sh	2005-05-13 11:58:43 +05:30
+++ 1.63/scripts/make_binary_distribution.sh	2005-08-05 16:59:44 +05:30
@@ -15,6 +15,7 @@
 STRIP=1
 DEBUG=0
 SILENT=0
+MACHINE=
 TMP=/tmp
 SUFFIX=""
 
@@ -25,6 +26,7 @@
       --tmp=*)    TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
       --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
       --no-strip) STRIP=0 ;;
+      --machine=*)  MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;;
       --silent)   SILENT=1 ;;
       *)
 	echo "Unknown argument '$arg'"
@@ -74,9 +76,6 @@
 fi
 
 for i in ChangeLog \
-         Docs/manual.html \
-         Docs/manual.txt \
-         Docs/manual_toc.html \
 				 Docs/mysql.info
 do
   if [ -f $i ]
@@ -255,8 +254,17 @@
   find $BASE/sql-bench -name SCCS -print | xargs rm -r -f
 fi
 
+# Use the override --machine if present
+if [ -n "$MACHINE" ] ; then
+  machine=$MACHINE
+fi
+
 # Change the distribution to a long descriptive name
 NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$system-$machine$SUFFIX
+
+# Print the platform name for build logs
+echo "PLATFORM NAME: $system-$machine"
+
 BASE2=$TMP/$NEW_NAME
 rm -r -f $BASE2
 mv $BASE $BASE2

--- 1.333/BitKeeper/etc/logging_ok	2005-03-30 13:47:26 +05:30
+++ 1.334/BitKeeper/etc/logging_ok	2005-08-05 16:59:25 +05:30
@@ -9,6 +9,7 @@
 ahlentz@stripped
 akishkin@stripped
 antony@stripped
+antony@stripped
 antony@stripped
 arjen@stripped
 arjen@stripped
@@ -29,6 +30,7 @@
 dlenev@stripped
 dlenev@stripped
 dlenev@stripped
+gbichot@stripped
 gbichot@stripped
 gerberb@stripped
 gluh@gluh.(none)
@@ -103,11 +105,14 @@
 monty@stripped
 monty@stripped
 monty@stripped
+mronstrom@stripped
 mwagner@stripped
 mwagner@stripped
 mwagner@stripped
+mwagner@stripped
 mwagner@stripped
 mysqldev@stripped
+ndbdev@stripped
 nick@stripped
 nick@stripped
 patg@stripped
@@ -142,6 +147,7 @@
 serg@stripped
 sergefp@stripped
 sinisa@stripped
+svoj@stripped
 tfr@stripped
 tfr@stripped
 tfr@stripped