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
9149d9fd
Commit
9149d9fd
authored
Mar 22, 2002
by
bar@gw.udmsearch.izhnet.ru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
filesort.cc:
Fixed that i mixed Field and Item in some cases
parent
21ef10ef
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
sql/filesort.cc
sql/filesort.cc
+3
-5
No files found.
sql/filesort.cc
View file @
9149d9fd
...
@@ -470,8 +470,7 @@ static void make_sortkey(register SORTPARAM *param,
...
@@ -470,8 +470,7 @@ static void make_sortkey(register SORTPARAM *param,
switch
(
sort_field
->
result_type
)
{
switch
(
sort_field
->
result_type
)
{
case
STRING_RESULT
:
case
STRING_RESULT
:
{
{
// BAR TODO: need checking that it is really Field_str based class
CHARSET_INFO
*
cs
=
item
->
str_value
.
charset
();
CHARSET_INFO
*
cs
=
((
Field_str
*
)(
sort_field
->
field
))
->
charset
();
if
(
item
->
maybe_null
)
if
(
item
->
maybe_null
)
*
to
++=
1
;
*
to
++=
1
;
...
@@ -948,8 +947,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
...
@@ -948,8 +947,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
#ifdef USE_STRCOLL
#ifdef USE_STRCOLL
if
(
!
sortorder
->
item
->
binary
)
if
(
!
sortorder
->
item
->
binary
)
{
{
// BAR TODO: need checking that it is really Field_str based class
CHARSET_INFO
*
cs
=
sortorder
->
item
->
str_value
.
charset
();
CHARSET_INFO
*
cs
=
((
Field_str
*
)(
sortorder
->
field
))
->
charset
();
if
(
use_strcoll
(
cs
))
if
(
use_strcoll
(
cs
))
sortorder
->
length
=
sortorder
->
length
*
cs
->
strxfrm_multiply
;
sortorder
->
length
=
sortorder
->
length
*
cs
->
strxfrm_multiply
;
}
}
...
...
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