diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-11-17 08:53:42 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-11-17 08:53:42 +0100 |
| commit | 7671fd70c042c3632d2a4b17b9b827c1aeb581f1 (patch) | |
| tree | aca38301c9448db018306ce59bef69f8ec6f039b /mysql-test | |
| parent | b7d32e053d3d5b80c5be0e0d0e8457141f9d1b47 (diff) | |
| download | mariadb-git-7671fd70c042c3632d2a4b17b9b827c1aeb581f1.tar.gz | |
MDEV-7080: rpl.rpl_gtid_crash fails sporadically in buildbot
The real problem here was inconsistent handling of entry->commit_errno in
MYSQL_BIN_LOG::write_transaction_or_stmt(). Some return paths were setting it
to the value of errno, some where not. And the setting was redundant anyway,
as it is set consistently by the caller.
Fix by consistently setting it in the caller, and not in each return path in
the function.
The test failure happened because a DBUG_EXECUTE_IF() used in the test case
set an entry->commit_errno that was immediately overwritten in the caller with
whatever happened to be the value of errno. This could lead to different error
message in the .result file.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_gtid_crash.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_crash.result b/mysql-test/suite/rpl/r/rpl_gtid_crash.result index debd107221f..3417ad561f4 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_crash.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_crash.result @@ -124,7 +124,7 @@ SET GLOBAL debug_dbug="+d,inject_error_writing_xid"; BEGIN; INSERT INTO t1 VALUES (11); COMMIT; -ERROR HY000: Error writing file 'master-bin' (errno: 11 "Resource temporarily unavailable") +ERROR HY000: Error writing file 'master-bin' (errno: 28 "No space left on device") SET GLOBAL debug_dbug="+d,crash_dispatch_command_before"; COMMIT; Got one of the listed errors @@ -141,7 +141,7 @@ SET GLOBAL debug_dbug="+d,inject_error_writing_xid"; BEGIN; INSERT INTO t1 VALUES (12); COMMIT; -ERROR HY000: Error writing file 'master-bin' (errno: 11 "Resource temporarily unavailable") +ERROR HY000: Error writing file 'master-bin' (errno: 28 "No space left on device") SET GLOBAL debug_dbug="+d,crash_dispatch_command_before"; COMMIT; Got one of the listed errors @@ -164,7 +164,7 @@ SET GLOBAL debug_dbug="+d,inject_error_writing_xid"; BEGIN; INSERT INTO t1 VALUES (21); COMMIT; -ERROR HY000: Error writing file 'master-bin' (errno: 11 "Resource temporarily unavailable") +ERROR HY000: Error writing file 'master-bin' (errno: 28 "No space left on device") SET GLOBAL debug_dbug="+d,crash_dispatch_command_before"; COMMIT; Got one of the listed errors @@ -185,7 +185,7 @@ SET GLOBAL debug_dbug="+d,inject_error_writing_xid"; BEGIN; INSERT INTO t1 VALUES (22); COMMIT; -ERROR HY000: Error writing file 'master-bin' (errno: 11 "Resource temporarily unavailable") +ERROR HY000: Error writing file 'master-bin' (errno: 28 "No space left on device") SET GLOBAL debug_dbug="+d,crash_dispatch_command_before"; COMMIT; Got one of the listed errors |