diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 11:57:38 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 11:57:38 +0800 |
| commit | 963051287538dc07c961d8baa18049f19c1977ab (patch) | |
| tree | a17e4b5853a3e4a0c4dcfcf7083591ba01362f80 /mysql-test/include/mtr_warnings.sql | |
| parent | 66481aebb0300678b0882f0f60b43cb2025a3285 (diff) | |
| parent | 6ae50d8aedbded8dcdc7504d116f25bcd02535ff (diff) | |
| download | mariadb-git-963051287538dc07c961d8baa18049f19c1977ab.tar.gz | |
Manual merge 5.1-rep+2 to 5.1-rep+3
Diffstat (limited to 'mysql-test/include/mtr_warnings.sql')
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index b99402c8031..2156c37f3e3 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -132,7 +132,7 @@ INSERT INTO global_suppressions VALUES ("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49"), - ("Statement is not safe to log in statement format"), + ("Statement may not be safe to log in statement format"), /* test case for Bug#bug29807 copies a stray frm into database */ ("InnoDB: Error: table `test`.`bug29807` does not exist in the InnoDB internal"), @@ -162,6 +162,8 @@ INSERT INTO global_suppressions VALUES ("Slave: Unknown column 'c7' in 't15' Error_code: 1054"), ("Slave: Can't DROP 'c7'.* 1091"), ("Slave: Key column 'c6'.* 1072"), + ("Slave I/O: The slave I/O thread stops because a fatal error is encountered when it try to get the value of SERVER_ID variable from master."), + (".SELECT UNIX_TIMESTAMP... failed on master, do not trust column Seconds_Behind_Master of SHOW SLAVE STATUS"), /* Test case for Bug#31590 in order_by.test produces the following error */ ("Out of sort memory; increase server sort buffer size"), |