summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
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/r/rpl_loaddata_fatal.result
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/r/rpl_loaddata_fatal.result')
-rw-r--r--mysql-test/suite/rpl/r/rpl_loaddata_fatal.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
index b13e2ced183..8ce630f7bc2 100644
--- a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
@@ -3,7 +3,7 @@ include/master-slave.inc
CREATE TABLE t1 (a INT, b INT);
INSERT INTO t1 VALUES (1,10);
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1;
-call mtr.add_suppression("Slave SQL.*Fatal error: Not enough memory, Error_code: 1593");
+call mtr.add_suppression("Slave SQL.*Fatal error: Not enough memory, error.* 1593");
include/wait_for_slave_sql_error_and_skip.inc [errno=1593]
Last_SQL_Error = 'Fatal error: Not enough memory'
DROP TABLE t1;