diff options
| author | unknown <joerg@mysql.com> | 2006-06-29 11:59:05 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-06-29 11:59:05 +0200 |
| commit | 592c0059584a94430cae78cc5ffeb7f45b9f755a (patch) | |
| tree | 073a110647d9bfcbce88703192f3035e8e8fde57 /scripts | |
| parent | fa99e3471594f99ad273c8f6a899a02a2e30762f (diff) | |
| parent | b024b6c0378788ddafecdc4ace7061b724c35d9d (diff) | |
| download | mariadb-git-592c0059584a94430cae78cc5ffeb7f45b9f755a.tar.gz | |
Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516).
BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
scripts/Makefile.am:
Manual merge: "ul" (the shell script is already deleted in 5.1)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 1b071a294ed..91e3c863fe6 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 \ |