Commit 0d17aea7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.0-clean 

into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqlcheck.c:
  Auto merged
mysys/my_rename.c:
  Auto merged
parents cde615c9 c6bb2293

client/mysqlcheck.c

+2 −1
Original line number Diff line number Diff line
@@ -566,6 +566,7 @@ static void print_result() 
  my_bool found_error=0;



  res = mysql_use_result(sock);



  prev[0] = '\0';

  for (i = 0; (row = mysql_fetch_row(res)); i++)

  {
@@ -595,7 +596,7 @@ static void print_result() 
    putchar('\n');

  }

  if (found_error && opt_auto_repair && what_to_do != DO_REPAIR &&

      (!opt_fast || strcmp(row[3],"OK")))

      !opt_fast)

    insert_dynamic(&tables4repair, prev);

  mysql_free_result(res);

}