database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge the changes of the 5.5.3-m3 release build

Browse Source 
back into the development branches.
This commit is contained in:
Joerg Bruehe
2010-04-18 15:32:05 +02:00
parent 091745c8a5 c62d8e5cb5
commit 4b68b2d289
10 changed files with 63 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/CMakeLists.txt
View File

@ -261,7 +261,7 @@ IF(WIN32)
SET(PLIN_FILES mysql_config mysql_secure_installation)
# Input files with .sh extension
SET(SH_FILES mysql_convert_table_format mysqld_multi mysqldumpslow
SET(SH_FILES mysql_convert_table_format mysqld_multi mysqldumpslow
mysqlhotcopy)
FOREACH(file ${PLIN_FILES})

7
scripts/make_win_bin_dist
View File

@ -249,6 +249,7 @@ cp include/mysql.h \
include/decimal.h \
include/errmsg.h \
include/my_global.h \
include/my_config.h \
include/my_net.h \
include/my_getopt.h \
include/sslopt-longopts.h \
@ -395,15 +396,15 @@ cp scripts/*.sql $DESTDIR/share/
# Clean up from possibly copied SCCS directories
# ----------------------------------------------------------------------
rm -rf `find $DISTDIR -type d -name SCCS -print`
rm -rf `find $DESTDIR -type d -name SCCS -print`
# ----------------------------------------------------------------------
# Copy other files specified on command line DEST=SOURCE
# ----------------------------------------------------------------------
for arg do
dst=`echo $arg | sed 's/=.*$//'`
src=`echo $arg | sed 's/^.*=//'`
dst=`echo $arg | sed -n 's/=.*$//p'`
src=`echo $arg | sed -n 's/^.*=//p'`
if [ x"$dst" = x"" -o x"$src" = x"" ] ; then
echo "Invalid specification of what to copy"