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
611484f9
Commit
611484f9
authored
Jul 27, 2012
by
Tor Didriksen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#14111180 HANDLE_FATAL_SIGNAL IN PTR_COMPARE_1 / QUEUE_INSERT
Space available for merging was calculated incorrectly.
parent
5ecb7db4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
sql/filesort.cc
sql/filesort.cc
+2
-3
No files found.
sql/filesort.cc
View file @
611484f9
/*
/*
Copyright (c) 2000, 201
1, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2000, 201
2, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -295,8 +295,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
...
@@ -295,8 +295,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
Use also the space previously used by string pointers in sort_buffer
Use also the space previously used by string pointers in sort_buffer
for temporary key storage.
for temporary key storage.
*/
*/
param
.
keys
=
((
param
.
keys
*
(
param
.
rec_length
+
sizeof
(
char
*
)))
/
param
.
keys
=
table_sort
.
sort_keys_size
/
param
.
rec_length
;
param
.
rec_length
-
1
);
maxbuffer
--
;
// Offset from 0
maxbuffer
--
;
// Offset from 0
if
(
merge_many_buff
(
&
param
,(
uchar
*
)
sort_keys
,
buffpek
,
&
maxbuffer
,
if
(
merge_many_buff
(
&
param
,(
uchar
*
)
sort_keys
,
buffpek
,
&
maxbuffer
,
&
tempfile
))
&
tempfile
))
...
...
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