summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay.choubey@oracle.com>2011-12-24 15:08:59 +0530
committerNirbhay Choubey <nirbhay.choubey@oracle.com>2011-12-24 15:08:59 +0530
commit0a8824e9c3dee8a6b183acde4fe8732bf3f0ed27 (patch)
tree3aa332af6e49b284a2bf86e746f4d1d019b993f2
parenta4343d56eda71ab95e8d092cebedfd5abf7c710b (diff)
downloadmariadb-git-0a8824e9c3dee8a6b183acde4fe8732bf3f0ed27.tar.gz
Bug#12809202 61854: MYSQLDUMP --SINGLE-TRANSACTION
--FLUSH-LOG BREAKS CONSISTENCY Post-fix for some failing tests.
-rw-r--r--client/mysqldump.c2
-rw-r--r--mysql-test/r/mysqldump.result4
-rw-r--r--mysql-test/t/mysqldump.test6
3 files changed, 12 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 11b76932692..e22ae5a8b09 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -562,6 +562,8 @@ static void verbose_msg(const char *fmt, ...)
vfprintf(stderr, fmt, args);
va_end(args);
+ fflush(stderr);
+
DBUG_VOID_RETURN;
}
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 5d03976f3a5..ee9b6a878cd 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -4762,3 +4762,7 @@ UNLOCK TABLES;
DROP TABLE b12809202_db.t1;
DROP TABLE b12809202_db.t2;
DROP DATABASE b12809202_db;
+#
+# Delete all existing binary logs.
+#
+RESET MASTER;
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index b1688986090..871b3735b1b 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -2243,9 +2243,15 @@ INSERT INTO b12809202_db.t2 VALUES (1), (2), (3);
--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