Commit 97c0c810 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


tests/mysql_client_test.c:
  Auto merged
parents 3d847396 ad0f34e3

tests/mysql_client_test.c

+2 −2
Original line number Diff line number Diff line
@@ -14950,7 +14950,7 @@ static void test_bug17667() 
  strcpy(master_log_filename, opt_vardir);

  strcat(master_log_filename, "/log/master.log");

  printf("Opening '%s'\n", master_log_filename);

  log_file= fopen(master_log_filename, "r");

  log_file= my_fopen(master_log_filename, (int) (O_RDONLY | O_BINARY), MYF(MY_WME));

  free(master_log_filename);



  if (log_file != NULL) {
@@ -14995,7 +14995,7 @@ static void test_bug17667() 
  }



  if (log_file != NULL)

    fclose(log_file);

    my_fclose(log_file, MYF(0));



}