diff options
| -rw-r--r-- | .bzr-mysql/default.conf | 2 | ||||
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index a81954c9bcd..07179ac7dea 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-trunk-mtr" +tree_name = "mysql-5.4.3-trunk" diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 47b1d9b10bb..52bf4cd51ef 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -162,7 +162,7 @@ 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."), + ("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 */ |