Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
This commit is contained in:
unknown
commit
7bf6bd51ff
@ -1,65 +0,0 @@
|
||||
LIBRARY LIBMYSQLD
|
||||
DESCRIPTION 'MySQL 4.0 Embedded Server Library'
|
||||
VERSION 4.0
|
||||
EXPORTS
|
||||
mysql_server_end
|
||||
mysql_server_init
|
||||
mysql_use_result
|
||||
mysql_thread_safe
|
||||
mysql_thread_id
|
||||
mysql_store_result
|
||||
mysql_stat
|
||||
mysql_shutdown
|
||||
mysql_select_db
|
||||
mysql_row_tell
|
||||
mysql_row_seek
|
||||
mysql_real_query
|
||||
mysql_real_connect
|
||||
mysql_query
|
||||
mysql_ping
|
||||
mysql_options
|
||||
mysql_num_rows
|
||||
mysql_num_fields
|
||||
mysql_list_tables
|
||||
mysql_list_processes
|
||||
mysql_list_fields
|
||||
mysql_list_dbs
|
||||
mysql_kill
|
||||
mysql_insert_id
|
||||
mysql_init
|
||||
mysql_info
|
||||
mysql_get_server_info
|
||||
mysql_get_proto_info
|
||||
mysql_get_host_info
|
||||
mysql_get_client_info
|
||||
mysql_free_result
|
||||
mysql_field_tell
|
||||
mysql_field_count
|
||||
mysql_field_seek
|
||||
mysql_fetch_row
|
||||
mysql_fetch_lengths
|
||||
mysql_fetch_fields
|
||||
mysql_fetch_field_direct
|
||||
mysql_fetch_field
|
||||
mysql_escape_string
|
||||
mysql_real_escape_string
|
||||
mysql_error
|
||||
mysql_errno
|
||||
mysql_eof
|
||||
mysql_dump_debug_info
|
||||
mysql_drop_db
|
||||
mysql_debug
|
||||
mysql_data_seek
|
||||
mysql_create_db
|
||||
mysql_character_set_name
|
||||
mysql_change_user
|
||||
mysql_connect
|
||||
mysql_close
|
||||
mysql_affected_rows
|
||||
mysql_thread_init
|
||||
mysql_thread_end
|
||||
mysql_send_query
|
||||
mysql_read_query_result
|
||||
mysql_refresh
|
||||
mysql_odbc_escape_string
|
||||
myodbc_remove_escape
|
||||
Binary file not shown.
@ -1,145 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
# show executed commands
|
||||
# set -x
|
||||
|
||||
# stop on errors
|
||||
set -e
|
||||
|
||||
BD=`pwd`
|
||||
|
||||
build=0
|
||||
build_debug=0
|
||||
skip_linux=0
|
||||
|
||||
# parse arguments
|
||||
for arg do
|
||||
case "$arg" in
|
||||
--build) build=1 ;;
|
||||
--build-debug) build_debug=1 ;;
|
||||
--skip-linux) skip_linux=1 ;;
|
||||
*) echo "$0: unrecognized option: $arg" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# run the auto tools
|
||||
autotools()
|
||||
{
|
||||
for package in $BD $BD/innobase
|
||||
do
|
||||
echo "cd $package"
|
||||
cd $package
|
||||
rm -f config.cache
|
||||
echo "aclocal"
|
||||
aclocal
|
||||
echo "autoheader"
|
||||
autoheader
|
||||
echo "libtoolize --force"
|
||||
libtoolize --force
|
||||
echo "aclocal"
|
||||
aclocal
|
||||
echo "automake --add-missing --force-missing"
|
||||
automake --add-missing --force-missing
|
||||
echo "autoconf"
|
||||
autoconf
|
||||
done
|
||||
|
||||
cd $BD
|
||||
}
|
||||
|
||||
# check the source direcotry
|
||||
echo "looking for \"$BD/sql/mysqld.cc\"..."
|
||||
if test ! -r ./sql/mysqld.cc
|
||||
then
|
||||
echo "./netware/nwbootstrap must be started from the top source directory"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# clean
|
||||
# make -j 2 -k distclean
|
||||
rm -f NEW-RPMS/*
|
||||
rm -f */.deps/*.P
|
||||
|
||||
# make files writeable
|
||||
chmod -R u+rw,g+rw .
|
||||
|
||||
# skip linux?
|
||||
if test $skip_linux -ne 1
|
||||
then
|
||||
echo "starting linux build..."
|
||||
|
||||
echo "autotools..."
|
||||
autotools
|
||||
|
||||
echo "configuring for linux..."
|
||||
./configure --without-docs --without-innodb
|
||||
|
||||
echo "building for linux..."
|
||||
make clean all
|
||||
|
||||
echo "copying required linux binaries..."
|
||||
rm -f */*.linux
|
||||
cp extra/comp_err extra/comp_err.linux
|
||||
cp libmysql/conf_to_src libmysql/conf_to_src.linux
|
||||
cp libmysql/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
|
||||
|
||||
echo "cleaning linux build..."
|
||||
make clean distclean
|
||||
fi
|
||||
|
||||
echo "starting netware build..."
|
||||
|
||||
# remove stale Makefile.in.bk files
|
||||
rm -rf Makefile.in.bk
|
||||
|
||||
# start mw enviornment
|
||||
chmod +x ./netware/nwconfigure
|
||||
chmod +x ./netware/mw/mwenv
|
||||
chmod +x ./netware/mw/mwasmnlm
|
||||
chmod +x ./netware/mw/mwccnlm
|
||||
chmod +x ./netware/mw/mwldnlm
|
||||
|
||||
. ./netware/mw/mwenv
|
||||
|
||||
# link nwconfigure
|
||||
rm -f ./nwconfigure
|
||||
ln ./netware/nwconfigure ./nwconfigure
|
||||
|
||||
# save old builds from previous run
|
||||
if test -e *.tar.gz
|
||||
then
|
||||
rm -f *.tar.gz.old
|
||||
rename .tar.gz .tar.gz.old *.tar.gz
|
||||
fi
|
||||
|
||||
echo "autotools..."
|
||||
autotools
|
||||
|
||||
# debug build
|
||||
if test $build_debug -eq 1
|
||||
then
|
||||
echo "configuring for netware (debug)..."
|
||||
./nwconfigure --with-debug=full
|
||||
|
||||
echo "building for netware (debug)..."
|
||||
make clean bin-dist
|
||||
|
||||
# mark the debug build
|
||||
rename .tar.gz -debug.tar.gz *.tar.gz
|
||||
fi
|
||||
|
||||
# release build
|
||||
if test $build -eq 1
|
||||
then
|
||||
echo "configuring for netware..."
|
||||
./nwconfigure
|
||||
|
||||
echo "building for netware..."
|
||||
make clean bin-dist
|
||||
fi
|
||||
|
||||
echo "done"
|
||||
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
#! /bin/sh
|
||||
CMD="\
|
||||
AR='mwldnlm' \
|
||||
AR_FLAGS='-type library -o' \
|
||||
AS='mwasmnlm' \
|
||||
CC='mwccnlm -gccincludes' \
|
||||
CFLAGS='-dialect c -proc 686 -bool on -relax_pointers -DUSE_OLD_FUNCTIONS' \
|
||||
CXX='mwccnlm -gccincludes' \
|
||||
CXXFLAGS='-dialect c++ -proc 686 -bool on -relax_pointers' \
|
||||
LD='mwldnlm' \
|
||||
LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -flags pseudopreemption' \
|
||||
RANLIB=: \
|
||||
STRIP=: \
|
||||
./configure --host=i686-pc-netware $* \
|
||||
--without-docs \
|
||||
--enable-local-infile \
|
||||
--with-extra-charsets=all \
|
||||
--prefix=N:/mysql \
|
||||
"
|
||||
#rm -f config.cache config.log config.status
|
||||
echo $CMD
|
||||
eval $CMD
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user