diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 15:07:36 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 15:07:36 -0300 |
| commit | c96b249fc3912f7a86f885cc62da1a3eeed537c6 (patch) | |
| tree | 3be217b0b2b0e9c76e6f41abe8c7fa3aeb35d373 /client/mysql_upgrade.c | |
| parent | d676c3ff0eef8613ac689df8ed07ecdd0a39817b (diff) | |
| download | mariadb-git-c96b249fc3912f7a86f885cc62da1a3eeed537c6.tar.gz | |
Bug#45288: pb2 returns a lot of compilation warnings on linux
Fix warnings flagged by the new warning option -Wunused-but-set-variable
that was added to GCC 4.6 and that is enabled by -Wunused and -Wall. The
option causes a warning whenever a local variable is assigned to but is
later unused. It also warns about meaningless pointer dereferences.
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 0b8b43775ed..3122cc25731 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -595,7 +595,10 @@ static int upgrade_already_done(void) my_fclose(in, MYF(0)); - return (strncmp(buf, MYSQL_SERVER_VERSION, + if (!res) + return 0; /* Could not read from file => not sure */ + + return (strncmp(res, MYSQL_SERVER_VERSION, sizeof(MYSQL_SERVER_VERSION)-1)==0); } |