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
1a2b5bb0
Commit
1a2b5bb0
authored
23 years ago
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug in count(distinct)
BitKeeper/etc/ignore: Added bdb/include/rpc_server_ext.h to the ignore list
parent
98026209
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
.bzrignore
.bzrignore
+1
-0
sql/item_sum.cc
sql/item_sum.cc
+3
-3
No files found.
.bzrignore
View file @
1a2b5bb0
...
...
@@ -355,3 +355,4 @@ support-files/mysql.server
support-files/mysql.spec
tags
tmp/*
bdb/include/rpc_server_ext.h
This diff is collapsed.
Click to expand it.
sql/item_sum.cc
View file @
1a2b5bb0
...
...
@@ -811,7 +811,7 @@ int composite_key_cmp(void* arg, byte* key1, byte* key2)
{
int
res
;
Field
*
f
=
*
field
;
int
len
=
f
->
field_length
;
int
len
=
f
->
pack_length
()
;
switch
((
*
field
)
->
type
())
{
case
FIELD_TYPE_STRING
:
...
...
@@ -921,7 +921,7 @@ bool Item_sum_count_distinct::setup(THD *thd)
compare_key
=
(
qsort_cmp2
)
simple_raw_key_cmp
;
break
;
}
cmp_arg
=
(
void
*
)(
key_len
=
field
->
field_length
);
cmp_arg
=
(
void
*
)(
key_len
=
field
->
pack_length
()
);
rec_offset
=
1
;
}
else
// too bad, cannot cheat - there is more than one field
...
...
@@ -931,7 +931,7 @@ bool Item_sum_count_distinct::setup(THD *thd)
field_end
=
(
field
=
table
->
field
)
+
table
->
fields
;
for
(
key_len
=
0
;
field
<
field_end
;
++
field
)
{
key_len
+=
(
*
field
)
->
field_length
;
key_len
+=
(
*
field
)
->
pack_length
()
;
if
(
!
(
*
field
)
->
binary
())
all_binary
=
0
;
}
...
...
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