bk commit into 4.1 tree (jamppa:1.2487)

[jani]

Below is the list of changes that have just been committed into a local
4.1 repository of mysqldev. When mysqldev 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.2487 05/10/14 07:56:08 jamppa@stripped +5 -0
  make_binary_distribution.sh, pack_isam.def, mwenv, my_strtoll10.c:
    Imported fix from latest 4.1
  configure.in:
    Changed version

  scripts/make_binary_distribution.sh
    1.85 05/10/14 07:55:49 jamppa@stripped +1 -2
    Imported fix from latest 4.1

  netware/pack_isam.def
    1.5 05/10/14 07:55:31 jamppa@stripped +1 -0
    Imported fix from latest 4.1

  netware/BUILD/mwenv
    1.11 05/10/14 07:55:16 jamppa@stripped +2 -2
    Imported fix from latest 4.1

  configure.in
    1.396 05/10/14 07:54:53 jamppa@stripped +1 -1
    Changed version

  strings/my_strtoll10.c
    1.10 05/10/14 07:54:33 jamppa@stripped +6 -0
    Imported fix from latest 4.1

# 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:	jamppa
# Host:	suse9-x86.mysql.com
# Root:	/home/mysqldev/mydev/mysql-4.1.15-build-dev

--- 1.395/configure.in	2005-09-13 20:46:53 +02:00
+++ 1.396/configure.in	2005-10-14 07:54:53 +02:00
@@ -5,7 +5,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 4.1.15)
+AM_INIT_AUTOMAKE(mysql, 4.1.15a)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

--- 1.84/scripts/make_binary_distribution.sh	2005-10-07 16:37:47 +02:00
+++ 1.85/scripts/make_binary_distribution.sh	2005-10-14 07:55:49 +02:00
@@ -254,8 +254,7 @@
       >> $BASE/bin/init_db.sql
   sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 \
       > $BASE/bin/test_db.sql
-#  cp ./netware/static_init_db.sql ./netware/init_db.sql
-#  ./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
+  ./scripts/fill_help_tables < ./Docs/manual.texi >> ./netware/init_db.sql
 fi
 
 #

--- 1.10/netware/BUILD/mwenv	2005-03-09 19:58:48 +01:00
+++ 1.11/netware/BUILD/mwenv	2005-10-14 07:55:16 +02:00
@@ -19,9 +19,9 @@
 export AR_FLAGS='-type library -o'
 export AS='mwasmnlm'
 export CC='mwccnlm -gccincludes'
-export CFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c'
+export CFLAGS='-align 8 -proc 686 -relax_pointers -dialect c'
 export CXX='mwccnlm -gccincludes'
-export CXXFLAGS='-O3 -align 8 -proc 686 -relax_pointers -dialect c++ -bool on -wchar_t on -D_WCHAR_T'
+export CXXFLAGS='-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.4/netware/pack_isam.def	2004-11-29 16:41:08 +01:00
+++ 1.5/netware/pack_isam.def	2005-10-14 07:55:31 +02:00
@@ -4,6 +4,7 @@
 MODULE	libc.nlm
 COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
 DESCRIPTION "MySQL ISAM Table Pack Tool"
+SCREENNAME "MySQL ISAM Table Pack Tool"
 VERSION 4, 0
 XDCDATA ../netware/mysql.xdc
 #DEBUG

--- 1.9/strings/my_strtoll10.c	2004-05-26 18:12:47 +02:00
+++ 1.10/strings/my_strtoll10.c	2005-10-14 07:54:33 +02:00
@@ -19,7 +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 */
+#if defined(__NETWARE__) && defined(__MWERKS__)
+ulonglong tmp;
+#define ULONGLONG_MAX (tmp =(~(ulonglong) 0))
+#else
 #define ULONGLONG_MAX		(~(ulonglong) 0)
+#endif
 #define MAX_NEGATIVE_NUMBER	((ulonglong) LL(0x8000000000000000))
 #define INIT_CNT  9
 #define LFACTOR   ULL(1000000000)