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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
0c26b8f1
Commit
0c26b8f1
authored
Sep 05, 2006
by
marko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
branches/zip: btr_copy_externally_stored_field(): Correct the
reporting and handling of inflate() errors.
parent
23128a45
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
btr/btr0cur.c
btr/btr0cur.c
+6
-4
No files found.
btr/btr0cur.c
View file @
0c26b8f1
...
...
@@ -4229,6 +4229,7 @@ btr_copy_externally_stored_field(
#endif
/* UNIV_SYNC_DEBUG */
if
(
UNIV_UNLIKELY
(
zip_size
))
{
int
err
;
ulint
next_page_no
;
if
(
UNIV_UNLIKELY
(
fil_page_get_type
(
page
)
!=
FIL_PAGE_TYPE_ZBLOB
))
{
...
...
@@ -4241,7 +4242,7 @@ btr_copy_externally_stored_field(
(
ulong
)
page_no
,
(
ulong
)
space_id
);
}
page_no
=
mach_read_from_4
(
page
+
offset
);
next_
page_no
=
mach_read_from_4
(
page
+
offset
);
if
(
UNIV_LIKELY
(
offset
==
FIL_PAGE_NEXT
))
{
/* When the BLOB begins at page header,
...
...
@@ -4260,14 +4261,14 @@ btr_copy_externally_stored_field(
case
Z_OK
:
break
;
case
Z_STREAM_END
:
if
(
page_no
==
FIL_NULL
)
{
if
(
next_
page_no
==
FIL_NULL
)
{
goto
end_of_blob
;
}
/* fall through */
default:
inflate_error:
mtr_commit
(
&
mtr
);
inflateEnd
(
&
d_stream
);
inflate_error:
ut_print_timestamp
(
stderr
);
fprintf
(
stderr
,
" InnoDB: inflate() of"
...
...
@@ -4279,7 +4280,7 @@ btr_copy_externally_stored_field(
return
(
buf
);
}
if
(
page_no
==
FIL_NULL
)
{
if
(
next_
page_no
==
FIL_NULL
)
{
err
=
inflate
(
&
d_stream
,
Z_FINISH
);
if
(
UNIV_UNLIKELY
(
err
!=
Z_STREAM_END
))
{
...
...
@@ -4301,6 +4302,7 @@ btr_copy_externally_stored_field(
/* On other BLOB pages except the first
the BLOB header always is at the page header: */
page_no
=
next_page_no
;
offset
=
FIL_PAGE_NEXT
;
}
else
{
byte
*
blob_header
=
page
+
offset
;
...
...
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