diff options
| author | unknown <joerg@mysql.com> | 2006-06-27 22:45:21 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-06-27 22:45:21 +0200 |
| commit | 1e22a12d3766cc80fb534fd3e71a30d76e85ab75 (patch) | |
| tree | 0e85ebc9607b30aae8343c4bb3212ee107ff4af4 /scripts | |
| parent | 7982816b8adac32e055849f0e8d15a973889ad1d (diff) | |
| parent | b024b6c0378788ddafecdc4ace7061b724c35d9d (diff) | |
| download | mariadb-git-1e22a12d3766cc80fb534fd3e71a30d76e85ab75.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/autopush20216-5.0
scripts/make_binary_distribution.sh:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 6 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_upgrade_shell.sh (renamed from scripts/mysql_upgrade.sh) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 0f68b484f41..a339ebc5b8f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -32,7 +32,7 @@ bin_SCRIPTS = @server_scripts@ \ mysqldumpslow \ mysql_explain_log \ mysql_tableinfo \ - mysql_upgrade \ + mysql_upgrade_shell \ mysqld_multi \ mysql_create_system_tables @@ -60,7 +60,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \ mysql_explain_log.sh \ mysqld_multi.sh \ mysql_tableinfo.sh \ - mysql_upgrade.sh \ + mysql_upgrade_shell.sh \ mysqld_safe.sh \ mysql_create_system_tables.sh @@ -89,7 +89,7 @@ CLEANFILES = @server_scripts@ \ mysqldumpslow \ mysql_explain_log \ mysql_tableinfo \ - mysql_upgrade \ + mysql_upgrade_shell \ mysqld_multi \ make_win_src_distribution \ mysql_create_system_tables diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index d96391f8aef..c344cf3e93a 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -134,7 +134,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \ client/mysql$BS client/mysqlshow$BS client/mysqladmin$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 \ diff --git a/scripts/mysql_upgrade.sh b/scripts/mysql_upgrade_shell.sh index c9f375b6c5b..c9f375b6c5b 100644 --- a/scripts/mysql_upgrade.sh +++ b/scripts/mysql_upgrade_shell.sh |