1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

It's not possible to use the return value of fputs

Browse Source 
to check if the creation of mysql_upgrade_info suceeded.
Instead use 'upgrade_already_done' to check that file was
created properly.
This commit is contained in:
msvensson@pilot.blaudden 2007-04-23 13:07:49 +02:00
parent b11a1c8fd4
commit 714c36ce27
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/mysql_upgrade.c
View File

@ -578,14 +578,20 @@ static void create_mysql_upgrade_info_file(void)
return; return;
} }
/* Write new version to file, just print a message if it fails */ /* Write new version to file */
if (!fputs(MYSQL_SERVER_VERSION, out)) 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, fprintf(stderr,
"Could not write to the upgrade info file '%s' in " "Could not write to the upgrade info file '%s' in "
"the MySQL Servers datadir, errno: %d\n", "the MySQL Servers datadir, errno: %d\n",
upgrade_info_file, errno); upgrade_info_file, errno);
return;
my_fclose(out, MYF(0));
} }