summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqldump.test
diff options
context:
space:
mode:
authorHe Zhenxing <zhenxing.he@sun.com>2009-10-18 11:57:38 +0800
committerHe Zhenxing <zhenxing.he@sun.com>2009-10-18 11:57:38 +0800
commit963051287538dc07c961d8baa18049f19c1977ab (patch)
treea17e4b5853a3e4a0c4dcfcf7083591ba01362f80 /mysql-test/t/mysqldump.test
parent66481aebb0300678b0882f0f60b43cb2025a3285 (diff)
parent6ae50d8aedbded8dcdc7504d116f25bcd02535ff (diff)
downloadmariadb-git-963051287538dc07c961d8baa18049f19c1977ab.tar.gz
Manual merge 5.1-rep+2 to 5.1-rep+3
Diffstat (limited to 'mysql-test/t/mysqldump.test')
-rw-r--r--mysql-test/t/mysqldump.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 5fe1f313967..83bace15305 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -7,6 +7,9 @@
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
+disable_query_log;
+call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
+enable_query_log;
--echo # Bug#37938 Test "mysqldump" lacks various insert statements
--echo # Turn off concurrent inserts to avoid random errors