database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-build

Browse Source 
into  mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build


extra/CMakeLists.txt:
  Auto merged
extra/resolveip.c:
  Auto merged
scripts/CMakeLists.txt:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged
scripts/mysql_convert_table_format.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysql_tableinfo.sh~c715458838a2a818:
  Auto merged
This commit is contained in:
unknown
2007-12-28 01:07:42 +01:00
parent c8f6457f65 471437fd47
commit 1e41f36c56
13 changed files with 1045 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/make_win_bin_dist
View File

@ -316,27 +316,26 @@ if [ -d mysql-test/extra ] ; then
fi
# ----------------------------------------------------------------------
# Copy what could be usable in the "scripts" directory. Currently
# only SQL files, others are Bourne shell scripts or Perl scripts
# not really usable on Windows.
#
# But to be nice to the few Cygwin users we might have in 5.0 we
# continue to copy the stuff, but don't include it in the WiX install.
# Copy what could be usable in the "scripts" directory
# ----------------------------------------------------------------------
mysql_scripts="\
mysql_config.pl \
mysql_convert_table_format.pl \
mysql_explain_log.pl \
mysql_install_db.pl \
mysql_secure_installation.pl \
mysql_tableinfo.pl \
mysqld_multi.pl \
mysqldumpslow.pl \
mysqlhotcopy.pl \
"
mkdir -p $DESTDIR/scripts
# Uncomment and remove the for loop in 5.1
#cp scripts/*.sql $DESTDIR/scripts/
for i in `cd scripts && ls`; do \
if echo $i | grep -q '\.sh'; then \
cp scripts/$i $DESTDIR/scripts/`echo $i | sed -e 's/\.sh$//'`; \
elif [ -d scripts/$i -o $i = Makefile.am -o $i = Makefile.in -o -e scripts/$i.sh ] ; then \
: ; \
else \
cp scripts/$i $DESTDIR/scripts/$i; \
fi; \
for i in $mysql_scripts
do
cp scripts/$i $DESTDIR/scripts/$i
done
cp -pR sql/share $DESTDIR/
@ -344,7 +343,7 @@ cp -pR sql-bench $DESTDIR/
rm -f $DESTDIR/sql-bench/*.sh $DESTDIR/sql-bench/Makefile*
# The SQL initialisation code is really expected to be in "share"
mv $DESTDIR/scripts/*.sql $DESTDIR/share/ || true
mv $DESTDIR/scripts/*.sql $DESTDIR/share/
# ----------------------------------------------------------------------
# Clean up from possibly copied SCCS directories