summaryrefslogtreecommitdiff
path: root/scripts/make_win_bin_dist
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-09-19 13:07:51 +0400
committerAlexander Nozdrin <alik@sun.com>2009-09-19 13:07:51 +0400
commitede2edd19b1baf4e8677f8bdc7e853c05eb5a4d5 (patch)
tree46e87f02d924b89bde60832867a57dd1b082b48a /scripts/make_win_bin_dist
parente60ff2b6a30f207f18760ca9a0de444110e800f5 (diff)
parent19d0529819c65dc4662b6a388fea7fbc7323b2f1 (diff)
downloadmariadb-git-ede2edd19b1baf4e8677f8bdc7e853c05eb5a4d5.tar.gz
Merge from mysql-5.1.
Diffstat (limited to 'scripts/make_win_bin_dist')
-rwxr-xr-xscripts/make_win_bin_dist17
1 files changed, 17 insertions, 0 deletions
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index e93f1999fb7..f3d66322b5f 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -277,6 +277,7 @@ cp include/mysql/plugin.h $DESTDIR/include/mysql/
# ----------------------------------------------------------------------
mkdir -p $DESTDIR/lib/opt
+mkdir -p $DESTDIR/lib/plugin
cp libmysql/$TARGET/libmysql.dll \
libmysql/$TARGET/libmysql.lib \
libmysql/$TARGET/mysqlclient.lib \
@@ -284,6 +285,10 @@ cp libmysql/$TARGET/libmysql.dll \
regex/$TARGET/regex.lib \
strings/$TARGET/strings.lib \
zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
+if [ -d storage/innodb_plugin ]; then
+ cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.dll \
+ $DESTDIR/lib/plugin/
+fi
if [ x"$TARGET" != x"release" ] ; then
cp libmysql/$TARGET/libmysql.pdb \
@@ -292,11 +297,17 @@ if [ x"$TARGET" != x"release" ] ; then
regex/$TARGET/regex.pdb \
strings/$TARGET/strings.pdb \
zlib/$TARGET/zlib.pdb $DESTDIR/lib/opt/
+ if [ -d storage/innodb_plugin ]; then
+ cp storage/innodb_plugin/$TARGET/ha_innodb_plugin.pdb \
+ $DESTDIR/lib/plugin/
+ fi
fi
+
if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
x"$PACK_DEBUG" = x"yes" ] ; then
mkdir -p $DESTDIR/lib/debug
+ mkdir -p $DESTDIR/lib/plugin/debug
cp libmysql/debug/libmysql.dll \
libmysql/debug/libmysql.lib \
libmysql/debug/libmysql.pdb \
@@ -310,6 +321,12 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
strings/debug/strings.pdb \
zlib/debug/zlib.lib \
zlib/debug/zlib.pdb $DESTDIR/lib/debug/
+ if [ -d storage/innodb_plugin ]; then
+ cp storage/innodb_plugin/debug/ha_innodb_plugin.dll \
+ storage/innodb_plugin/debug/ha_innodb_plugin.lib \
+ storage/innodb_plugin/debug/ha_innodb_plugin.pdb \
+ $DESTDIR/lib/plugin/debug/
+ fi
fi
# ----------------------------------------------------------------------