From f1e81f6c8d288bc723dbcf508043498f2551c285 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 23 Apr 2007 13:07:49 +0200 Subject: It's not possible to use the return value of fputs to check if the creation of mysql_upgrade_info suceeded. Instead use 'upgrade_already_done' to check that file was created properly. --- client/mysql_upgrade.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'client/mysql_upgrade.c') diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index aeda47c48eb..d7486327e1b 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -578,14 +578,20 @@ static void create_mysql_upgrade_info_file(void) return; } - /* Write new version to file, just print a message if it fails */ - if (!fputs(MYSQL_SERVER_VERSION, out)) + /* Write new version to file */ + fputs(MYSQL_SERVER_VERSION, out); + my_fclose(out, MYF(0)); + + /* + Check if the upgrad_info_file was properly created/updated + It's not a fatal error -> just print a message if it fails + */ + if (!upgrade_already_done()) fprintf(stderr, "Could not write to the upgrade info file '%s' in " "the MySQL Servers datadir, errno: %d\n", upgrade_info_file, errno); - - my_fclose(out, MYF(0)); + return; } -- cgit v1.2.1