summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2011-02-23 12:54:58 +0100
committerBjorn Munch <bjorn.munch@oracle.com>2011-02-23 12:54:58 +0100
commitfba6bdf989b3df619c7ea1c6d69c123df0eed7f4 (patch)
tree597fc443436c6ee13ba71d8d2b703bb51ff429cc /mysql-test/include
parent562978e1abaa7f2b073e6192173f009c358e8ac4 (diff)
parent1f9d8cd862a5a4599ebc141c2334b4661841d280 (diff)
downloadmariadb-git-fba6bdf989b3df619c7ea1c6d69c123df0eed7f4.tar.gz
Upmerge 11762407 (54999) with additions
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/mtr_warnings.sql1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index 78cc9882d79..ebaddf1f1ec 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -125,7 +125,6 @@ INSERT INTO global_suppressions VALUES
("Slave: The incident LOST_EVENTS occured on the master"),
("Slave: Unknown error.* 1105"),
("Slave: Can't drop database.* database doesn't exist"),
- ("Slave SQL:.*(Error_code: \[\[:digit:\]\]+|Query:.*)"),
("Sort aborted"),
("Time-out in NDB"),
("Warning:\s+One can only use the --user.*root"),