diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
| commit | f59ef9eafa076cd5d3ae3aedc609efa457492ebe (patch) | |
| tree | a1ec5dfbd668a88bc0b6c98db397a421d2b37f21 /client/mysql_upgrade.c | |
| parent | a0e44ec1e8d2352df6dbf40c959e2115c9884c7e (diff) | |
| parent | 2217de25139f5994fc1c5c71f897ff0788813db0 (diff) | |
| download | mariadb-git-f59ef9eafa076cd5d3ae3aedc609efa457492ebe.tar.gz | |
Merge from 5.0 for 43414
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 645fb037647..cfd7ed4ea56 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -552,6 +552,7 @@ static int upgrade_already_done(void) FILE *in; char upgrade_info_file[FN_REFLEN]= {0}; char buf[sizeof(MYSQL_SERVER_VERSION)+1]; + char *res; if (get_upgrade_info_file_name(upgrade_info_file)) return 0; /* Could not get filename => not sure */ @@ -564,7 +565,7 @@ static int upgrade_already_done(void) will be detected by the strncmp */ bzero(buf, sizeof(buf)); - fgets(buf, sizeof(buf), in); + res= fgets(buf, sizeof(buf), in); my_fclose(in, MYF(0)); |