bzr push into mysql-trunk branch (nirbhay.choubey:3685 to 3686) Bug#12809202

[Nirbhay Choubey]

 3686 Nirbhay Choubey	2011-12-24 [merge]
      Merge of post-fix for bug#12809202 from mysql-5.5

    modified:
      client/mysqldump.c
      mysql-test/r/mysqldump.result
      mysql-test/t/mysqldump.test
 3685 Nirbhay Choubey	2011-12-23 [merge]
      Merge of patch for bug#12809202 from mysql-5.5.

    modified:
      client/mysqldump.c
      mysql-test/r/mysqldump.result
      mysql-test/t/mysqldump.test
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2011-12-23 17:40:23 +0000
+++ b/client/mysqldump.c	2011-12-24 09:43:56 +0000
@@ -569,6 +569,8 @@ static void verbose_msg(const char *fmt,
   vfprintf(stderr, fmt, args);
   va_end(args);
 
+  fflush(stderr);
+
   DBUG_VOID_RETURN;
 }
 

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2011-12-23 17:40:23 +0000
+++ b/mysql-test/r/mysqldump.result	2011-12-24 09:43:56 +0000
@@ -4818,3 +4818,7 @@ UNLOCK TABLES;
 DROP TABLE b12809202_db.t1;
 DROP TABLE b12809202_db.t2;
 DROP DATABASE b12809202_db;
+#
+# Delete all existing binary logs.
+#
+RESET MASTER;

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2011-12-23 17:40:23 +0000
+++ b/mysql-test/t/mysqldump.test	2011-12-24 09:43:56 +0000
@@ -2267,9 +2267,15 @@ INSERT INTO b12809202_db.t2 VALUES (1), 
 --echo
 --echo #### Dump ends here ####
 
+# Cleanup
 DROP TABLE b12809202_db.t1;
 DROP TABLE b12809202_db.t2;
 DROP DATABASE b12809202_db;
 
+--echo #
+--echo # Delete all existing binary logs.
+--echo #
+RESET MASTER;
+
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc

No bundle (reason: useless for push emails).