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
3f3473cf
Commit
3f3473cf
authored
Feb 26, 2006
by
guilhem@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for a segfault in my previous cset (about WL#2712 and WL#2977).
parent
eb468833
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
sql/sql_load.cc
sql/sql_load.cc
+1
-2
sql/sql_repl.cc
sql/sql_repl.cc
+2
-0
No files found.
sql/sql_load.cc
View file @
3f3473cf
...
...
@@ -948,8 +948,7 @@ READ_INFO::READ_INFO(File file_par, uint tot_length, CHARSET_INFO *cs,
if
(
get_it_from_net
)
cache
.
read_function
=
_my_b_net_read
;
if
(((
LOAD_FILE_INFO
*
)
cache
.
arg
)
->
thd
->
current_stmt_binlog_row_based
&&
mysql_bin_log
.
is_open
())
if
(
mysql_bin_log
.
is_open
())
cache
.
pre_read
=
cache
.
pre_close
=
(
IO_CACHE_CALLBACK
)
log_loaded_block
;
#endif
...
...
sql/sql_repl.cc
View file @
3f3473cf
...
...
@@ -1576,6 +1576,8 @@ int log_loaded_block(IO_CACHE* file)
if
(
!
(
block_len
=
(
char
*
)
file
->
read_end
-
(
char
*
)
buffer
))
return
0
;
lf_info
=
(
LOAD_FILE_INFO
*
)
file
->
arg
;
if
(
lf_info
->
thd
->
current_stmt_binlog_row_based
)
return
0
;
if
(
lf_info
->
last_pos_in_file
!=
HA_POS_ERROR
&&
lf_info
->
last_pos_in_file
>=
file
->
pos_in_file
)
return
0
;
...
...
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