summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2008-03-14 15:09:10 +0100
committerunknown <joerg@trift2.>2008-03-14 15:09:10 +0100
commit3bd473f05cab6c2c6ff3568296cc0579d7ef761e (patch)
treec8845c4c09966976fee1d5931396c0ee4db3dd2d /scripts
parentde8d73c7c5d127dc947c82fb372452ce807f3c0e (diff)
parent593b467a2b7fbbc26e5b3c3fda7b8f5fba87de6a (diff)
downloadmariadb-git-3bd473f05cab6c2c6ff3568296cc0579d7ef761e.tar.gz
Merge trift2.:/MySQL/M50/clone-5.0
into trift2.:/MySQL/M50/push-5.0 scripts/make_win_bin_dist: Auto merged
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/CMakeLists.txt3
-rwxr-xr-xscripts/make_win_bin_dist1
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index d7bcb8fd4e7..8aca7792e7c 100755
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -73,6 +73,9 @@ CONFIGURE_FILE(mysql_secure_installation.pl.in
CONFIGURE_FILE(mysql_tableinfo.sh
scripts/mysql_tableinfo.pl ESCAPE_QUOTES @ONLY)
+CONFIGURE_FILE(mysql_upgrade_shell.sh
+ scripts/mysql_upgrade_shell.pl ESCAPE_QUOTES @ONLY)
+
CONFIGURE_FILE(mysqld_multi.sh
scripts/mysqld_multi.pl ESCAPE_QUOTES @ONLY)
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index 8a57b545ac7..56ef427cd02 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -351,6 +351,7 @@ mysql_explain_log.pl \
mysql_install_db.pl \
mysql_secure_installation.pl \
mysql_tableinfo.pl \
+mysql_upgrade_shell.pl \
mysqld_multi.pl \
mysqldumpslow.pl \
mysqlhotcopy.pl \