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
a9c3db68
Commit
a9c3db68
authored
Oct 11, 2006
by
msvensson@shellback.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
parents
d070c84f
d9278a58
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
storage/myisam/sort.c
storage/myisam/sort.c
+2
-2
No files found.
storage/myisam/sort.c
View file @
a9c3db68
...
@@ -324,7 +324,7 @@ pthread_handler_t thr_find_all_keys(void *arg)
...
@@ -324,7 +324,7 @@ pthread_handler_t thr_find_all_keys(void *arg)
if
(
info
->
sort_info
->
got_error
)
if
(
info
->
sort_info
->
got_error
)
goto
err
;
goto
err
;
if
(
info
->
keyinfo
->
flag
&
&
HA_VAR_LENGTH_KEY
)
if
(
info
->
keyinfo
->
flag
&
HA_VAR_LENGTH_KEY
)
{
{
info
->
write_keys
=
write_keys_varlen
;
info
->
write_keys
=
write_keys_varlen
;
info
->
read_to_buffer
=
read_to_buffer_varlen
;
info
->
read_to_buffer
=
read_to_buffer_varlen
;
...
@@ -517,7 +517,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param)
...
@@ -517,7 +517,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param)
{
{
if
(
got_error
)
if
(
got_error
)
continue
;
continue
;
if
(
sinfo
->
keyinfo
->
flag
&
&
HA_VAR_LENGTH_KEY
)
if
(
sinfo
->
keyinfo
->
flag
&
HA_VAR_LENGTH_KEY
)
{
{
sinfo
->
write_keys
=
write_keys_varlen
;
sinfo
->
write_keys
=
write_keys_varlen
;
sinfo
->
read_to_buffer
=
read_to_buffer_varlen
;
sinfo
->
read_to_buffer
=
read_to_buffer_varlen
;
...
...
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