diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2010-04-18 15:32:05 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2010-04-18 15:32:05 +0200 |
| commit | 4b68b2d289ab338d5bd9c6f15d64e31a1d4be0dc (patch) | |
| tree | c875ec9df2c1c5133605fe134c52fdb4dc1c30b9 /scripts | |
| parent | 091745c8a571e36a0bc4bb1f2230ef2aa81c00a7 (diff) | |
| parent | c62d8e5cb5ae57cedd08f761e99cab0e98f8496a (diff) | |
| download | mariadb-git-4b68b2d289ab338d5bd9c6f15d64e31a1d4be0dc.tar.gz | |
Merge the changes of the 5.5.3-m3 release build
back into the development branches.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | scripts/make_win_bin_dist | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index ad0f5652b1c..f39224b9457 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -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}) diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index e54a14cc66e..9af722f7afc 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -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" |