summaryrefslogtreecommitdiff
path: root/client/mysql_upgrade.c
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-11-06 18:22:32 +0100
committerunknown <knielsen@knielsen-hq.org>2009-11-06 18:22:32 +0100
commitad368a2b54f4177daf5abd17fa7533f1626f6feb (patch)
treec762060dc3c06f7b35460ef22fecc08cf8adee55 /client/mysql_upgrade.c
parent716c09936365c9cfeb2304ca54ffdd95c1031c6e (diff)
parenta6793a48e20c2aebb1391e2f4f916cf147ff1900 (diff)
downloadmariadb-git-ad368a2b54f4177daf5abd17fa7533f1626f6feb.tar.gz
Merge Mysql 5.1.39 merge into MariaDB trunk
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r--client/mysql_upgrade.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index f44edf89081..61ff5f49dbf 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 */