database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge from 5.0 for 43414

Browse Source
This commit is contained in:
Staale Smedseng
2009-08-28 18:21:54 +02:00
parent a0e44ec1e8 2217de2513
commit f59ef9eafa
45 changed files with 119 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysql_upgrade.c
View File

@ -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));