bk commit into 5.0 tree (bldsql:1.1983)

[kvishwanatha]

Below is the list of changes that have just been committed into a local
5.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.1983 05/10/17 14:04:54 bldsql@stripped +4 -0
  Merge bk://mysql.bkbits.net/mysql-5.0
  into  blr-naas-nwl03.blr.novell.com:/home/bldsql/bk/mysql-5.0-web

  strings/my_strtoll10.c
    1.13 05/10/17 14:04:45 bldsql@stripped +0 -0
    Auto merged

  strings/decimal.c
    1.66 05/10/17 14:04:45 bldsql@stripped +0 -0
    Auto merged

  netware/mysql_test_run.c
    1.20 05/10/17 14:04:45 bldsql@stripped +0 -1
    Auto merged

  netware/BUILD/mwenv
    1.13 05/10/17 14:04:45 bldsql@stripped +0 -0
    Auto merged

# 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/mysql-5.0-web/RESYNC

--- 1.12/netware/BUILD/mwenv	2005-10-05 19:43:38 +05:30
+++ 1.13/netware/BUILD/mwenv	2005-10-17 14:04:45 +05:30
@@ -19,9 +19,9 @@
 export AR_FLAGS='-type library -o'
 export AS='mwasmnlm'
 export CC='mwccnlm -gccincludes'
-export CFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c'
+export CFLAGS='-enum int -align 8 -proc 686 -relax_pointers -dialect c'
 export CXX='mwccnlm -gccincludes'
-export CXXFLAGS='-enum int -O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
+export CXXFLAGS='-enum int -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
 export LD='mwldnlm'
 export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
 export RANLIB=:

--- 1.12/strings/my_strtoll10.c	2005-09-16 14:51:53 +05:30
+++ 1.13/strings/my_strtoll10.c	2005-10-17 14:04:45 +05:30
@@ -19,10 +19,13 @@
 #include <m_string.h>
 
 #undef  ULONGLONG_MAX
-/* Needed under MetroWerks Compiler, since MetroWerks compiler does not properly handle a constant expression containing a mod operator */
+/*
+  Needed under MetroWerks Compiler, since MetroWerks compiler does not
+  properly handle a constant expression containing a mod operator
+*/
 #if defined(__NETWARE__) && defined(__MWERKS__) 
-ulonglong tmp;
-#define ULONGLONG_MAX (tmp =(~(ulonglong) 0))
+static ulonglong ulonglong_max= ~(ulonglong) 0;
+#define ULONGLONG_MAX ulonglong_max
 #else
 #define ULONGLONG_MAX		(~(ulonglong) 0)
 #endif /* __NETWARE__ && __MWERKS__ */

--- 1.65/strings/decimal.c	2005-10-04 14:20:37 +05:30
+++ 1.66/strings/decimal.c	2005-10-17 14:04:45 +05:30
@@ -2022,7 +2022,7 @@
   if (to->buf < buf1)
   {
     dec1 *cur_d= to->buf;
-    for (; d_to_move; d_to_move--, cur_d++, buf1++)
+    for (; d_to_move--; cur_d++, buf1++)
       *cur_d= *buf1;
   }
   return error;