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
9ad986cd
Commit
9ad986cd
authored
13 years ago
by
Tor Didriksen
Browse files
Options
Browse Files
Download
Plain Diff
merge 5.1 => 5.5
parents
18ef5a97
35c5d31f
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
11 deletions
+34
-11
mysql-test/valgrind.supp
mysql-test/valgrind.supp
+34
-0
sql/filesort.cc
sql/filesort.cc
+0
-11
No files found.
mysql-test/valgrind.supp
View file @
9ad986cd
...
@@ -876,3 +876,37 @@
...
@@ -876,3 +876,37 @@
fun:buf_buddy_free_low
fun:buf_buddy_free_low
fun:buf_buddy_free
fun:buf_buddy_free
}
}
{
Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / one
Memcheck:Param
write(buf)
obj:*/libpthread*.so
fun:my_write
fun:my_b_flush_io_cache
fun:_my_b_write
fun:_ZL10write_keysP13st_sort_paramPPhjP11st_io_cacheS4_
fun:_ZL13find_all_keysP13st_sort_paramP10SQL_SELECTPPhP11st_io_cacheS6_S6_
fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
}
{
Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / two
Memcheck:Param
write(buf)
obj:*/libpthread*.so
fun:my_write
fun:my_b_flush_io_cache
fun:_Z15merge_many_buffP13st_sort_paramPhP10st_buffpekPjP11st_io_cache
fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
}
{
Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / three
Memcheck:Param
write(buf)
obj:*/libpthread*.so
fun:my_write
fun:my_b_flush_io_cache
fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
}
This diff is collapsed.
Click to expand it.
sql/filesort.cc
View file @
9ad986cd
...
@@ -972,21 +972,10 @@ static void make_sortkey(register SORTPARAM *param,
...
@@ -972,21 +972,10 @@ static void make_sortkey(register SORTPARAM *param,
if
(
addonf
->
null_bit
&&
field
->
is_null
())
if
(
addonf
->
null_bit
&&
field
->
is_null
())
{
{
nulls
[
addonf
->
null_offset
]
|=
addonf
->
null_bit
;
nulls
[
addonf
->
null_offset
]
|=
addonf
->
null_bit
;
#ifdef HAVE_purify
bzero
(
to
,
addonf
->
length
);
#endif
}
}
else
else
{
{
#ifdef HAVE_purify
uchar
*
end
=
field
->
pack
(
to
,
field
->
ptr
);
uint
length
=
(
uint
)
((
to
+
addonf
->
length
)
-
end
);
DBUG_ASSERT
((
int
)
length
>=
0
);
if
(
length
)
bzero
(
end
,
length
);
#else
(
void
)
field
->
pack
(
to
,
field
->
ptr
);
(
void
)
field
->
pack
(
to
,
field
->
ptr
);
#endif
}
}
to
+=
addonf
->
length
;
to
+=
addonf
->
length
;
}
}
...
...
This diff is collapsed.
Click to expand it.
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