Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
805f0093
Commit
805f0093
authored
Nov 02, 2010
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error insert to have deterministic errno (fixes test failure on mac).
parent
a786357b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
mysql-test/suite/binlog/r/binlog_ioerr.result
mysql-test/suite/binlog/r/binlog_ioerr.result
+2
-2
sql/log.cc
sql/log.cc
+2
-1
No files found.
mysql-test/suite/binlog/r/binlog_ioerr.result
View file @
805f0093
...
@@ -4,9 +4,9 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
...
@@ -4,9 +4,9 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=innodb;
INSERT INTO t1 VALUES(0);
INSERT INTO t1 VALUES(0);
SET SESSION debug='+d,fail_binlog_write_1';
SET SESSION debug='+d,fail_binlog_write_1';
INSERT INTO t1 VALUES(1);
INSERT INTO t1 VALUES(1);
ERROR HY000: Error writing file 'master-bin' (errno: 2
2
)
ERROR HY000: Error writing file 'master-bin' (errno: 2
8
)
INSERT INTO t1 VALUES(2);
INSERT INTO t1 VALUES(2);
ERROR HY000: Error writing file 'master-bin' (errno: 2
2
)
ERROR HY000: Error writing file 'master-bin' (errno: 2
8
)
SET SESSION debug='';
SET SESSION debug='';
INSERT INTO t1 VALUES(3);
INSERT INTO t1 VALUES(3);
SELECT * FROM t1;
SELECT * FROM t1;
...
...
sql/log.cc
View file @
805f0093
...
@@ -4772,7 +4772,8 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE *cache)
...
@@ -4772,7 +4772,8 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE *cache)
}
}
/* Write data to the binary log file */
/* Write data to the binary log file */
DBUG_EXECUTE_IF
(
"fail_binlog_write_1"
,
return
ER_ERROR_ON_WRITE
;);
DBUG_EXECUTE_IF
(
"fail_binlog_write_1"
,
errno
=
28
;
return
ER_ERROR_ON_WRITE
;);
if
(
my_b_write
(
&
log_file
,
cache
->
read_pos
,
length
))
if
(
my_b_write
(
&
log_file
,
cache
->
read_pos
,
length
))
return
ER_ERROR_ON_WRITE
;
return
ER_ERROR_ON_WRITE
;
cache
->
read_pos
=
cache
->
read_end
;
// Mark buffer used up
cache
->
read_pos
=
cache
->
read_end
;
// Mark buffer used up
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment