summaryrefslogtreecommitdiff
path: root/client/mysql_upgrade.c
diff options
context:
space:
mode:
authorholyfoot@deer.(none) <>2006-05-01 22:16:08 +0500
committerholyfoot@deer.(none) <>2006-05-01 22:16:08 +0500
commit9b832153f9d43281f0506b0a968754c357ef6e00 (patch)
tree6ea1ce305a71a1ea16e8e1e7caf4d8df9c647c39 /client/mysql_upgrade.c
parentbad7e32a949982c07a738ce83bc5f87a562d90a3 (diff)
downloadmariadb-git-9b832153f9d43281f0506b0a968754c357ef6e00.tar.gz
Fix for Win build
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r--client/mysql_upgrade.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 78e4acd4c1d..551be79fc99 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -135,7 +135,9 @@ static int create_check_file(const char *path)
if (check_file < 0)
return 1;
- error= my_write(check_file, VERSION, strlen(VERSION), MYF(MY_WME | MY_FNABP));
+ error= my_write(check_file,
+ MYSQL_SERVER_VERSION, strlen(MYSQL_SERVER_VERSION),
+ MYF(MY_WME | MY_FNABP));
error= my_close(check_file, MYF(MY_FAE | MY_WME)) || error;
return error;
}
@@ -243,7 +245,7 @@ int main(int argc, char **argv)
&& (test_file_exists("./bin", "mysqld") ||
test_file_exists("./libexec", "mysqld")))
{
- getcwd(bindir, sizeof(bindir));
+ my_getwd(bindir, sizeof(bindir), MYF(0));
bindir_end= bindir + strlen(bindir);
}
else