summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@sun.com>2009-11-06 17:08:06 +0000
committerLuis Soares <luis.soares@sun.com>2009-11-06 17:08:06 +0000
commit25b7b377f218f1ded7d4b3b67c71afd6fb20460d (patch)
tree5e7b6a422f7078c9127a8d902864472ff080d919 /mysql-test/include
parent40587d0ca5aa75e24efe36cde8f3059c68412459 (diff)
parent27028272f31a8b79ef708a68ccf90b03f9907688 (diff)
downloadmariadb-git-25b7b377f218f1ded7d4b3b67c71afd6fb20460d.tar.gz
auto-merge bzr bundle from bug report into latest mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/mtr_warnings.sql9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index 57e7cb97d48..b2cc86fbd46 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -175,6 +175,15 @@ INSERT INTO global_suppressions VALUES
("Can't find file: '.\\\\test\\\\\\?{8}.frm'"),
("Slave: Unknown table 't1' Error_code: 1051"),
+ /*
+ Transient network failures that cause warnings on reconnect.
+ BUG#47743 and BUG#47983.
+ */
+ ("Slave I/O: Get master SERVER_ID failed with error:.*"),
+ ("Slave I/O: Get master clock failed with error:.*"),
+ ("Slave I/O: Get master COLLATION_SERVER failed with error:.*"),
+ ("Slave I/O: Get master TIME_ZONE failed with error:.*"),
+
("THE_LAST_SUPPRESSION")||