Commit 2b9ed519 authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents c58d8ffb 01290bee

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -1735,7 +1735,7 @@ sub environment_setup () { 
  # Setup env so childs can execute mysql_client_test

  # ----------------------------------------------------

  my $cmdline_mysql_client_test=

    "$exe_mysql_client_test --no-defaults --testcase --user=root --silent " .

    "$exe_mysql_client_test --no-defaults --testcase --user=root " .

    "--port=$master->[0]->{'port'} " .

    "--socket=$master->[0]->{'path_sock'}";

  if ( $mysql_version_id >= 50000 )

tests/mysql_client_test.c

+2 −1
Original line number Diff line number Diff line
@@ -121,8 +121,9 @@ static void client_disconnect(); 


void die(const char *file, int line, const char *expr)

{

  fflush(stdout);

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

  fflush(NULL);

  fflush(stderr);

  abort();

}