mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
merge with 4.0.15
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-database.c~af098622e818ce0d: Auto merged BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f: Auto merged BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged SSL/cacert.pem: Auto merged acconfig.h: Auto merged acinclude.m4: Auto merged configure.in: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged VC++Files/client/mysql.dsp: Auto merged VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/comp_err/comp_err.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisamlog/myisamlog.dsp: Auto merged VC++Files/mysql.dsw: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqlmanager/MySqlManager.dsp: Auto merged VC++Files/mysqlserver/mysqlserver.dsp: Auto merged VC++Files/mysqlshutdown/mysqlshutdown.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/test1/test1.dsp: Auto merged VC++Files/thr_test/thr_test.dsp: Auto merged VC++Files/vio/vio.dsp: Auto merged VC++Files/zlib/zlib.dsp: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged extra/my_print_defaults.c: Auto merged extra/resolveip.c: Auto merged include/m_string.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/os/os0file.c: Auto merged isam/_search.c: Auto merged libmysql/Makefile.am: Auto merged libmysql/errmsg.c: Auto merged libmysql/libmysql.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_search.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamlog.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/isam.result: Auto merged mysql-test/r/loaddata.result: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/openssl_1.result: Auto merged mysql-test/r/packet.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/select_safe.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/group_by.test: Auto merged mysql-test/t/lock_tables_lost_commit-master.opt: Auto merged mysql-test/t/lowercase_table.test: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/openssl_1.test: Auto merged mysql-test/t/range.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_log.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/symlink.test: Auto merged mysys/default.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_pthread.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/item_uniq.h: Auto merged sql/log_event.h: Auto merged sql/net_serv.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_update.cc: Auto merged vio/Makefile.am: Auto merged vio/vio.c: Auto merged mysql-test/t/myisam.test: merge with 4.0.15 Extra tests mysys/mf_keycache.c: Keep local file
This commit is contained in:
unknown
@ -14,6 +14,7 @@ SILENT=0
|
||||
SUFFIX=""
|
||||
DIRNAME=""
|
||||
OUTTAR=0
|
||||
OUTZIP=0
|
||||
|
||||
#
|
||||
# This script must run from MySQL top directory
|
||||
@ -62,7 +63,8 @@ show_usage()
|
||||
echo " --suffix Suffix name for the package"
|
||||
echo " --dirname Directory name to copy files (intermediate)"
|
||||
echo " --silent Do not list verbosely files processed"
|
||||
echo " --tar Create tar.gz package instead of .zip"
|
||||
echo " --tar Create tar.gz package"
|
||||
echo " --zip Create zip package"
|
||||
echo " --help Show this help message"
|
||||
|
||||
exit 0
|
||||
@ -75,12 +77,14 @@ show_usage()
|
||||
parse_arguments() {
|
||||
for arg do
|
||||
case "$arg" in
|
||||
--add-tar) ADDTAR=1 ;;
|
||||
--debug) DEBUG=1;;
|
||||
--tmp=*) TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
|
||||
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
|
||||
--dirname=*) DIRNAME=`echo "$arg" | sed -e "s;--dirname=;;"` ;;
|
||||
--silent) SILENT=1 ;;
|
||||
--tar) OUTTAR=1 ;;
|
||||
--zip) OUTZIP=1 ;;
|
||||
--help) show_usage ;;
|
||||
*)
|
||||
echo "Unknown argument '$arg'"
|
||||
@ -98,15 +102,29 @@ parse_arguments "$@"
|
||||
|
||||
for i in $TMP $TMPDIR $TEMPDIR $TEMP /tmp
|
||||
do
|
||||
if [ "$i" ]; then
|
||||
if [ "$i" ]; then
|
||||
print_debug "Setting TMP to '$i'"
|
||||
TMP=$i
|
||||
TMP=$i
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Convert argument file from unix to DOS text
|
||||
#
|
||||
|
||||
unix_to_dos()
|
||||
{
|
||||
for arg do
|
||||
print_debug "Replacing LF -> CRLF from '$arg'"
|
||||
|
||||
sed -e 's/$/\r/' $arg > $arg.tmp
|
||||
rm -f $arg
|
||||
mv $arg.tmp $arg
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Create a tmp dest directory to copy files
|
||||
@ -123,14 +141,9 @@ $CP -r $SOURCE/VC++Files $BASE
|
||||
(
|
||||
find $BASE \( -name "*.dsp" -o -name "*.dsw" \) -and -not -path \*SCCS\* -print
|
||||
)|(
|
||||
while read v
|
||||
while read v
|
||||
do
|
||||
print_debug "Replacing LF -> CRLF from '$v'"
|
||||
|
||||
# ^M -> type CTRL V + CTRL M
|
||||
cat $v | sed 's/
|
||||
//' | sed 's/$/
|
||||
/' > $v.tmp
|
||||
unix_to_dos $v
|
||||
done
|
||||
)
|
||||
|
||||
@ -147,7 +160,7 @@ rm -r -f "$BASE/share/Makefile.am"
|
||||
# Clean up if we did this from a bk tree
|
||||
#
|
||||
|
||||
#
|
||||
if [ -d $BASE/SCCS ]
|
||||
then
|
||||
find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
|
||||
fi
|
||||
@ -169,9 +182,9 @@ copy_dir_files()
|
||||
mkdir $BASE/$arg
|
||||
fi
|
||||
for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def \
|
||||
fi
|
||||
for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def \
|
||||
README INSTALL* LICENSE
|
||||
README INSTALL* LICENSE
|
||||
do
|
||||
if [ -f $i ]
|
||||
then
|
||||
$CP $SOURCE/$arg/$i $BASE/$arg/$i
|
||||
fi
|
||||
@ -195,21 +208,19 @@ copy_dir_dirs() {
|
||||
|
||||
for arg do
|
||||
|
||||
for arg do
|
||||
|
||||
basedir=$arg
|
||||
|
||||
if [ ! -d $BASE/$arg ]; then
|
||||
mkdir $BASE/$arg
|
||||
fi
|
||||
|
||||
copy_dir_files $arg
|
||||
|
||||
cd $SOURCE/$arg/
|
||||
for i in *
|
||||
do
|
||||
if [ -d $SOURCE/$basedir/$i ] && [ "$i" != "SCCS" ]; then
|
||||
copy_dir_files $basedir/$i
|
||||
cd $SOURCE
|
||||
(
|
||||
find $arg -type d \
|
||||
-and -not -path \*SCCS\* \
|
||||
-and -not -path \*.deps\* \
|
||||
-and -not -path \*autom4te.cache -print
|
||||
)|(
|
||||
while read v
|
||||
do
|
||||
copy_dir_files $v
|
||||
done
|
||||
)
|
||||
|
||||
done
|
||||
}
|
||||
|
||||
@ -220,7 +231,7 @@ copy_dir_dirs() {
|
||||
for i in client dbug extra heap include isam \
|
||||
libmysql libmysqld merge myisam \
|
||||
myisammrg mysys regex sql strings sql-common \
|
||||
libmysql libmysqld merge myisam \
|
||||
tools vio zlib
|
||||
do
|
||||
copy_dir_files $i
|
||||
done
|
||||
@ -249,31 +260,49 @@ touch $BASE/innobase/ib_config.h
|
||||
#
|
||||
|
||||
cd $SOURCE
|
||||
|
||||
for i in COPYING COPYING.LIB ChangeLog README \
|
||||
INSTALL-SOURCE INSTALL-WIN \
|
||||
INSTALL-WIN-SOURCE \
|
||||
Docs/manual_toc.html Docs/manual.html \
|
||||
INSTALL-WIN-SOURCE \
|
||||
Docs/manual_toc.html Docs/manual.html \
|
||||
Docs/manual.txt Docs/mysqld_error.txt \
|
||||
Docs/INSTALL-BINARY
|
||||
|
||||
do
|
||||
print_debug "Copying file '$i'"
|
||||
do
|
||||
if [ -f $i ]
|
||||
then
|
||||
$CP $i $BASE/$i
|
||||
fi
|
||||
done
|
||||
|
||||
#
|
||||
# Raw dirs from source tree
|
||||
#
|
||||
|
||||
for i in Docs/Flags scripts sql-bench SSL \
|
||||
tests
|
||||
do
|
||||
print_debug "Copying directory '$i'"
|
||||
if [ -d $i ]
|
||||
then
|
||||
$CP -R $i $BASE/$i
|
||||
fi
|
||||
done
|
||||
|
||||
#
|
||||
# Fix some windows files
|
||||
#
|
||||
|
||||
./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp
|
||||
|
||||
unix_to_dos $BASE/README
|
||||
mv $BASE/README $BASE/README.txt
|
||||
|
||||
#
|
||||
# Initialize the initial data directory
|
||||
#
|
||||
|
||||
#
|
||||
if [ -f scripts/mysql_install_db ]; then
|
||||
print_debug "Initializing the 'data' directory"
|
||||
scripts/mysql_install_db --no-defaults --windows --datadir=$BASE/data
|
||||
fi
|
||||
@ -334,9 +363,13 @@ which_1 ()
|
||||
# Create the result zip/tar file
|
||||
#
|
||||
|
||||
#
|
||||
if [ [ "$OUTTAR" = "0" ] && [ "$OUTZIP" = "0" ] ]; then
|
||||
OUTZIP=1
|
||||
fi
|
||||
|
||||
set_tarzip_options()
|
||||
{
|
||||
set_tarzip_options()
|
||||
for arg
|
||||
do
|
||||
if [ "$arg" = "tar" ]; then
|
||||
ZIPFILE1=gnutar
|
||||
@ -360,43 +393,60 @@ set_tarzip_options()
|
||||
done
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if [ "$OUTTAR" = "1" ]; then
|
||||
set_tarzip_options 'tar'
|
||||
else
|
||||
set_tarzip_options 'zip'
|
||||
fi
|
||||
|
||||
tar=`which_1 $ZIPFILE1 $ZIPFILE2`
|
||||
if test "$?" = "1" -o "$tar" = ""
|
||||
then
|
||||
print_debug "Search failed for '$ZIPFILE1', '$ZIPFILE2', using default 'tar'"
|
||||
tar=tar
|
||||
|
||||
#
|
||||
# Create the archive
|
||||
#
|
||||
create_archive()
|
||||
{
|
||||
|
||||
#
|
||||
print_debug "Using $tar to create archive"
|
||||
|
||||
print_debug "Using $tar to create archive"
|
||||
cd $TMP
|
||||
|
||||
cd $TMP
|
||||
|
||||
rm -f $SOURCE/$NEW_NAME$EXT
|
||||
rm -f $SOURCE/$NEW_NAME$EXT
|
||||
$tar $OPT $SOURCE/$NEW_NAME$EXT $NEW_DIR_NAME
|
||||
cd $SOURCE
|
||||
|
||||
cd $SOURCE
|
||||
|
||||
if [ "$NEED_COMPRESS" = "1" ]
|
||||
then
|
||||
print_debug "Compressing archive"
|
||||
if [ "$NEED_COMPRESS" = "1" ]
|
||||
then
|
||||
print_debug "Compressing archive"
|
||||
gzip -9 $NEW_NAME$EXT
|
||||
EXT="$EXT.gz"
|
||||
fi
|
||||
|
||||
if [ "$SILENT" = "0" ] ; then
|
||||
echo "$NEW_NAME$EXT created successfully !!"
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$OUTTAR" = "1" ]; then
|
||||
set_tarzip_options 'tar'
|
||||
|
||||
tar=`which_1 $ZIPFILE1 $ZIPFILE2`
|
||||
if test "$?" = "1" -o "$tar" = ""
|
||||
then
|
||||
print_debug "Search failed for '$ZIPFILE1', '$ZIPFILE2', using default 'tar'"
|
||||
tar=tar
|
||||
set_tarzip_options 'tar'
|
||||
fi
|
||||
|
||||
create_archive
|
||||
fi
|
||||
|
||||
if [ "$OUTZIP" = "1" ]; then
|
||||
set_tarzip_options 'zip'
|
||||
|
||||
tar=`which_1 $ZIPFILE1 $ZIPFILE2`
|
||||
if test "$?" = "1" -o "$tar" = ""
|
||||
then
|
||||
echo "Search failed for '$ZIPFILE1', '$ZIPFILE2', cannot create zip!"
|
||||
fi
|
||||
|
||||
create_archive
|
||||
fi
|
||||
|
||||
print_debug "Removing temporary directory"
|
||||
rm -r -f $BASE
|
||||
|
||||
rm -r -f $BASE
|
||||
|
||||
if [ "$SILENT" = "0" ] ; then
|
||||
# End of script
|
||||
|
||||
Reference in New Issue
Block a user