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

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


mysql-test/mysql-test-run.pl:
  Auto merged
tests/mysql_client_test.c:
  Remove the fflush(NULL) and instead explicitly fflush stdout and then stderr

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index e3929b41a9e..5a718b7bde9 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -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();
 }