diff options
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_gtid_crash.result | 8 | ||||
| -rw-r--r-- | sql/log.cc | 8 |
2 files changed, 5 insertions, 11 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 diff --git a/sql/log.cc b/sql/log.cc index 34795db66b8..71b1b8728af 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -7437,7 +7437,6 @@ MYSQL_BIN_LOG::write_transaction_or_stmt(group_commit_entry *entry, write_cache(entry->thd, mngr->get_binlog_cache_log(FALSE))) { entry->error_cache= &mngr->stmt_cache.cache_log; - entry->commit_errno= errno; DBUG_RETURN(ER_ERROR_ON_WRITE); } @@ -7458,7 +7457,6 @@ MYSQL_BIN_LOG::write_transaction_or_stmt(group_commit_entry *entry, if (write_cache(entry->thd, mngr->get_binlog_cache_log(TRUE))) { entry->error_cache= &mngr->trx_cache.cache_log; - entry->commit_errno= errno; DBUG_RETURN(ER_ERROR_ON_WRITE); } } @@ -7466,14 +7464,13 @@ MYSQL_BIN_LOG::write_transaction_or_stmt(group_commit_entry *entry, DBUG_EXECUTE_IF("inject_error_writing_xid", { entry->error_cache= NULL; - entry->commit_errno= 28; + errno= 28; DBUG_RETURN(ER_ERROR_ON_WRITE); }); if (entry->end_event->write(&log_file)) { entry->error_cache= NULL; - entry->commit_errno= errno; DBUG_RETURN(ER_ERROR_ON_WRITE); } status_var_add(entry->thd->status_var.binlog_bytes_written, @@ -7484,7 +7481,6 @@ MYSQL_BIN_LOG::write_transaction_or_stmt(group_commit_entry *entry, if (entry->incident_event->write(&log_file)) { entry->error_cache= NULL; - entry->commit_errno= errno; DBUG_RETURN(ER_ERROR_ON_WRITE); } } @@ -7492,13 +7488,11 @@ MYSQL_BIN_LOG::write_transaction_or_stmt(group_commit_entry *entry, if (mngr->get_binlog_cache_log(FALSE)->error) // Error on read { entry->error_cache= &mngr->stmt_cache.cache_log; - entry->commit_errno= errno; DBUG_RETURN(ER_ERROR_ON_WRITE); } if (mngr->get_binlog_cache_log(TRUE)->error) // Error on read { entry->error_cache= &mngr->trx_cache.cache_log; - entry->commit_errno= errno; DBUG_RETURN(ER_ERROR_ON_WRITE); } |