summaryrefslogtreecommitdiff
path: root/client/mysql_upgrade.c
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-13 13:39:49 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-13 13:39:49 +0100
commit8c598f607f75f82803bc74eea258a0fa553caffc (patch)
tree0d8c6ce9a29ace8f6948b48b345f627ad5a46a7b /client/mysql_upgrade.c
parented5be81fbcc39c28c41d53098047dc3f58f8ff8c (diff)
downloadmariadb-git-8c598f607f75f82803bc74eea258a0fa553caffc.tar.gz
Make it possible for .test suites to run "mysql_upgrade"
Add new test file mysql_upgrade.test BitKeeper/deleted/.del-abi_check.ic: Rename: include/abi_check.ic -> BitKeeper/deleted/.del-abi_check.ic client/mysql_upgrade.c: Make mysql_upgrade search also in "client" dir so it can be run from a source dist. mysql-test/mysql-test-run.pl: Make it possible for .test scripts to run "mysql_upgrade" mysql-test/r/mysql_upgrade.result: New BitKeeper file ``mysql-test/r/mysql_upgrade.result'' mysql-test/t/mysql_upgrade.test: New BitKeeper file ``mysql-test/t/mysql_upgrade.test''
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r--client/mysql_upgrade.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index b8344606448..deeeb47851d 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -546,7 +546,7 @@ int main(int argc, char **argv)
}
if (find_file(mysqlcheck_name, basedir, MYF(0), path, sizeof(path),
- "bin", NullS))
+ "bin", "client", NullS))
{
ret= 1;
printf("Can't find program '%s'\n", mysqlcheck_name);
@@ -583,7 +583,7 @@ int main(int argc, char **argv)
fix_priv_tables:
if (find_file(mysql_name, basedir, MYF(0), path, sizeof(path),
- "bin", NullS))
+ "bin", "client", NullS))
{
ret= 1;
puts("Could not find MySQL command-line client (mysql).\n"