Commit aaf2c26e authored by holyfoot@mysql.com's avatar holyfoot@mysql.com
Browse files

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/hf/work/mysql-5.0.clean
parents 1205ae82 aab0e9c2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int main(int argc, char **argv)
    b_read= my_read(check_file, chf_buffer, sizeof(chf_buffer)-1, MYF(0));
    chf_buffer[b_read]= 0;
    my_close(check_file, MYF(0));
    if (!strcmp(chf_buffer, VERSION))
    if (!strcmp(chf_buffer, MYSQL_SERVER_VERSION))
    {
      if (opt_verbose)
        puts("mysql_upgrade already done for this version");