Commit f93b1e48 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
parents 3212394a 966d11ef

tests/mysql_client_test.c

+4 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void client_disconnect(); 
void die(const char *file, int line, const char *expr)

{

  fprintf(stderr, "%s:%d: check failed: '%s'\n", file, line, expr);

  fflush(stderr);

  fflush(NULL);

  abort();

}
@@ -14930,7 +14930,9 @@ static void test_bug17667() 
    myquery(rc);

  }



  sleep(1); /* The server may need time to flush the data to the log. */

  /* Make sure the server has written the logs to disk before reading it */

  rc= mysql_query(mysql, "flush logs");

  myquery(rc);



  master_log_filename = (char *) malloc(strlen(opt_vardir) + strlen("/log/master.log") + 1);

  strcpy(master_log_filename, opt_vardir);