diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-07-25 17:23:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-07-25 17:23:38 +0200 |
| commit | b457573f28e76332f38d8a16c9afd7bc0b8d63ef (patch) | |
| tree | 49ec9b3aca1581ee369a44d247722db11b8e9d95 /scripts | |
| parent | 68f02c65ef09601591ec5cb9521aaa5bfde9309e (diff) | |
| download | mariadb-git-b457573f28e76332f38d8a16c9afd7bc0b8d63ef.tar.gz | |
fixes for buildbot
mysql-test/suite/funcs_1/r/is_columns_is.result:
update for monty changes
mysql-test/valgrind.supp:
more generic suppression for dlerror() internal allocations
scripts/make_win_bin_dist:
update for hakan changes - we don't generate .map files anymore
sql/CMakeLists.txt:
innodb_plugin is said to need .map files in sql/
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/make_win_bin_dist | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index aa252ed2b7b..bdaa07a907f 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -163,7 +163,7 @@ if [ -f "storage/pbxt/bin/xtstat.exe" ] ; then cp storage/pbxt/bin/xtstat.{exe,pdb} $DESTDIR/bin fi -cp server-tools/instance-manager/$TARGET/*.{exe,map} $DESTDIR/bin/ +cp server-tools/instance-manager/$TARGET/*.exe $DESTDIR/bin/ if [ x"$TARGET" != x"release" ] ; then cp server-tools/instance-manager/$TARGET/*.pdb $DESTDIR/bin/ cp client/$TARGET/mysql.pdb $DESTDIR/bin/ @@ -361,7 +361,7 @@ cp -R mysql-test/{t,r,include,suite,std_data,lib,collections} $DESTDIR/mysql-tes rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_kill.{dir,vcproj} rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/my_safe_process.{dir,vcproj} -rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb,map} +rm -rf $DESTDIR/mysql-test/lib/My/SafeProcess/{Debug,RelWithDebInfo}/*.{ilk,idb} # Note that this will not copy "extra" if a soft link |