summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2006-07-06 17:58:31 +0200
committerunknown <joerg@trift2.>2006-07-06 17:58:31 +0200
commitb8057c4af0407c3d2466b4975d22fca563a0a9a6 (patch)
tree1a8049315fa5765ab3606e8775f26f67e87e14f3 /scripts
parent1ceab206b95b35447a850c0fbbff59aa2adcea2f (diff)
parent592c0059584a94430cae78cc5ffeb7f45b9f755a (diff)
downloadmariadb-git-b8057c4af0407c3d2466b4975d22fca563a0a9a6.tar.gz
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into trift2.:/M51/bug20216-5.1 scripts/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: Auto merged
Diffstat (limited to 'scripts')
-rw-r--r--scripts/make_binary_distribution.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index def7b7898bc..58799880769 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -138,7 +138,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
client/mysqlslap$BS \
client/mysqldump$BS client/mysqlimport$BS \
client/mysqltest$BS client/mysqlcheck$BS \
- client/mysqlbinlog$BS \
+ client/mysqlbinlog$BS client/mysql_upgrade$BS \
tests/mysql_client_test$BS \
libmysqld/examples/mysql_client_test_embedded$BS \
libmysqld/examples/mysqltest_embedded$BS \