summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/t/rpl_row_colSize.test
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-05-03 01:54:47 +0300
committerMichael Widenius <monty@askmonty.org>2013-05-03 01:54:47 +0300
commiteb75edfb2b3ac024f0d47860056b8d42f7dc3911 (patch)
tree5165e1637a13cf87361eed680757ecb6e6d9bee9 /mysql-test/suite/rpl/t/rpl_row_colSize.test
parent8cdb118a0a4cbc193a233a6aea90feb159844eab (diff)
downloadmariadb-git-eb75edfb2b3ac024f0d47860056b8d42f7dc3911.tar.gz
Instead of writing "Errcode" to the log for Slave errors, use "Internal MariaDB error code"
This makes it clear that the error code has nothing to do with errno. mysql-test/include/mtr_warnings.sql: Fixed suppression for new slave error messages mysql-test/lib/My/Test.pm: Use 'send' instead of 'print' to avoid errors about "wrong class ... back attempt" mysql-test/lib/v1/mtr_report.pl: Fixed suppression for new slave error messages mysql-test/mysql-test-run.pl: Fixed suppression for new slave error messages Removed warning from perl 5.16.2 about arrays mysql-test/r/flush_read_lock.result: Fixed suppression for new slave error messages sql/rpl_reporting.cc: Instead of writing "Errcode" to the log for Slave errors, use "Internal MariaDB error code"
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_row_colSize.test')
-rw-r--r--mysql-test/suite/rpl/t/rpl_row_colSize.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_row_colSize.test b/mysql-test/suite/rpl/t/rpl_row_colSize.test
index 0701c44edd3..cdffe2e333b 100644
--- a/mysql-test/suite/rpl/t/rpl_row_colSize.test
+++ b/mysql-test/suite/rpl/t/rpl_row_colSize.test
@@ -161,8 +161,8 @@ let $test_insert = INSERT INTO t1 VALUES ('This is a test.');
source include/test_fieldsize.inc;
connection slave;
-call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* Error_code: 1535");
-call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 0 ...e mismatch.* error.* 1535");
+call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* error.* 1677");
--echo *** Cleanup ***
connection master;