Merge romeo.(none):/home/bkroot/mysql-5.1-rpl

into  romeo.(none):/home/bk/merge-mysql-5.1


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged

1 files changed, 7 insertions, 1 deletions

diff --git a/server-tools/instance-manager/log.cc b/server-tools/instance-manager/log.cc
index 145f99db521..9f276523e49 100644
--- a/server-tools/instance-manager/log.cc
+++ b/server-tools/instance-manager/log.cc
@@ -134,7 +134,10 @@ void log_init()
 
 /*
   The function is intended to log error messages. It precedes a message
-  with date, time and [ERROR] tag and print it to the stderr.
+  with date, time and [ERROR] tag and print it to the stderr and stdout.
+
+  We want to print it on stdout to be able to know in which context we got the
+  error
 
   SYNOPSIS
     log_error()
@@ -146,7 +149,10 @@ void log_error(const char *format, ...)
 {
   va_list args;
   va_start(args, format);
+  log(stdout, "ERROR", format, args);
+  fflush(stdout);
   log(stderr, "ERROR", format, args);
+  fflush(stderr);
   va_end(args);
 }