Merge trift2.:/MySQL/M50/clone-5.0

into trift2.:/MySQL/M50/push-5.0

Merge trift2.:/MySQL/M50/clone-5.0
into trift2.:/MySQL/M50/push-5.0
30f3d4ab · joerg@trift2 · b399594a · 00160fe9 · 30f3d4ab · 30f3d4ab
Commit 30f3d4ab authored Mar 14, 2008 by joerg@trift2
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

scripts/CMakeLists.txt scripts/CMakeLists.txt +3 -0

scripts/make_win_bin_dist scripts/make_win_bin_dist +1 -0

No files found.
--- 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)

--- 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 \