diff options
| author | unknown <jimw@mysql.com> | 2006-05-01 10:59:14 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-05-01 10:59:14 -0700 |
| commit | 71b3a5aa3549219f4992176483244664f9a72a0f (patch) | |
| tree | 85bc5be65a289011a46559e23eb14aa5defdb0ff /client | |
| parent | 3dd4fcb31fae469d178c7db9a02dc1cc5060882c (diff) | |
| parent | d91a45af4d849e74af7e84061c214beda5e13286 (diff) | |
| download | mariadb-git-71b3a5aa3549219f4992176483244664f9a72a0f.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 6 |
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 |