diff options
author | Michael Widenius <monty@askmonty.org> | 2013-05-03 01:54:47 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-05-03 01:54:47 +0300 |
commit | eb75edfb2b3ac024f0d47860056b8d42f7dc3911 (patch) | |
tree | 5165e1637a13cf87361eed680757ecb6e6d9bee9 /mysql-test/suite/rpl/r/rpl_rotate_logs.result | |
parent | 8cdb118a0a4cbc193a233a6aea90feb159844eab (diff) | |
download | mariadb-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/r/rpl_rotate_logs.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_rotate_logs.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result index 83d97bad6b7..ecf6f5109f7 100644 --- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result +++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result @@ -38,7 +38,7 @@ drop table temp_table, t3; insert into t2 values(1234); set insert_id=1234; insert into t2 values(NULL); -call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .1234. for key .PRIMARY.. on query.* Error_code: 1062"); +call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .1234. for key .PRIMARY.. on query.* error.* 1062"); include/wait_for_slave_sql_error_and_skip.inc [errno=1062] purge master logs to 'master-bin.000002'; show master logs; |