bk commit into 5.0 tree (msvensson:1.2333)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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:51:07+02:00, msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.1616.2144.249

  mysql-test/mysql-test-run.pl@stripped, 2006-10-24 18:50:24+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.8.9.70

  tests/mysql_client_test.c@stripped, 2006-10-24 18:51:05+02:00, msvensson@neptunus.(none) +0 -1
    Remove the fflush(NULL) and instead explicitly fflush stdout and then stderr
    MERGE: 1.51.1.120

# 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-5.0-maint/RESYNC

--- 1.138/mysql-test/mysql-test-run.pl	2006-10-24 18:51:12 +02:00
+++ 1.139/mysql-test/mysql-test-run.pl	2006-10-24 18:51:12 +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.210/tests/mysql_client_test.c	2006-10-24 18:51:12 +02:00
+++ 1.211/tests/mysql_client_test.c	2006-10-24 18:51:12 +02:00
@@ -121,8 +121,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(NULL);
+  fflush(stderr);
   abort();
 }