Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
This commit is contained in:
commit
cf173e553d
@ -19,9 +19,9 @@ export AR='mwldnlm'
|
|||||||
export AR_FLAGS='-type library -o'
|
export AR_FLAGS='-type library -o'
|
||||||
export AS='mwasmnlm'
|
export AS='mwasmnlm'
|
||||||
export CC='mwccnlm -gccincludes'
|
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 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 LD='mwldnlm'
|
||||||
export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
|
export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
|
||||||
export RANLIB=:
|
export RANLIB=:
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
MODULE libc.nlm
|
MODULE libc.nlm
|
||||||
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
|
||||||
DESCRIPTION "MySQL ISAM Table Pack Tool"
|
DESCRIPTION "MySQL ISAM Table Pack Tool"
|
||||||
|
SCREENNAME "MySQL ISAM Table Pack Tool"
|
||||||
VERSION 4, 0
|
VERSION 4, 0
|
||||||
XDCDATA ../netware/mysql.xdc
|
XDCDATA ../netware/mysql.xdc
|
||||||
#DEBUG
|
#DEBUG
|
||||||
|
@ -254,8 +254,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
|
|||||||
>> $BASE/bin/init_db.sql
|
>> $BASE/bin/init_db.sql
|
||||||
sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 \
|
sh ./scripts/mysql_create_system_tables.sh test "" "%" 0 \
|
||||||
> $BASE/bin/test_db.sql
|
> $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
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -19,7 +19,16 @@
|
|||||||
#include <m_string.h>
|
#include <m_string.h>
|
||||||
|
|
||||||
#undef ULONGLONG_MAX
|
#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__)
|
||||||
|
static ulonglong ulonglong_max= ~(ulonglong) 0;
|
||||||
|
#define ULONGLONG_MAX ulonglong_max
|
||||||
|
#else
|
||||||
#define ULONGLONG_MAX (~(ulonglong) 0)
|
#define ULONGLONG_MAX (~(ulonglong) 0)
|
||||||
|
#endif /* __NETWARE__ && __MWERKS__ */
|
||||||
#define MAX_NEGATIVE_NUMBER ((ulonglong) LL(0x8000000000000000))
|
#define MAX_NEGATIVE_NUMBER ((ulonglong) LL(0x8000000000000000))
|
||||||
#define INIT_CNT 9
|
#define INIT_CNT 9
|
||||||
#define LFACTOR ULL(1000000000)
|
#define LFACTOR ULL(1000000000)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user