bk commit into 4.1 tree (msvensson:1.2601)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-24 18:49:19+02:00, msvensson@neptunus.(none) +2 -0
  Run mysql_client_test without --silent
  Flush both stdout and stderr before abort'ing mysql_client_test

  mysql-test/mysql-test-run.pl@stripped, 2006-10-24 18:49:18+02:00, msvensson@neptunus.(none) +1 -1
    Run mysql_client_test wihtout --silent flag

  tests/mysql_client_test.c@stripped, 2006-10-24 18:49:18+02:00, msvensson@neptunus.(none) +2 -0
    Before aborting mysql_client_test in die, make sure
    to first flush stdout and finally after the error message 
    has been printed also fflush stderr 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.128/mysql-test/mysql-test-run.pl	2006-10-24 18:49:23 +02:00
+++ 1.129/mysql-test/mysql-test-run.pl	2006-10-24 18:49:23 +02:00
@@ -1735,7 +1735,7 @@
   # 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 )

--- 1.170/tests/mysql_client_test.c	2006-10-24 18:49:23 +02:00
+++ 1.171/tests/mysql_client_test.c	2006-10-24 18:49:23 +02:00
@@ -113,7 +113,9 @@
 
 void die(const char *file, int line, const char *expr)
 {
+  fflush(stdout);
   fprintf(stderr, "%s:%d: check failed: '%s'\n", file, line, expr);
+  fflush(stderr);
   abort();
 }