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
dccac583
Commit
dccac583
authored
Mar 11, 2003
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed an obscure bug in group by + having + Item_ref::get_date
parent
312f0366
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
4 deletions
+27
-4
mysql-test/r/group_by.result
mysql-test/r/group_by.result
+1
-0
mysql-test/t/group_by.test
mysql-test/t/group_by.test
+8
-0
sql/item.cc
sql/item.cc
+11
-0
sql/item.h
sql/item.h
+7
-4
No files found.
mysql-test/r/group_by.result
View file @
dccac583
...
...
@@ -128,3 +128,4 @@ a MAX(b) ELT(MAX(b), 'a', 'b', 'c', 'd', 'e', 'f')
a MAX(b) MAKE_SET(MAX(b), 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h')
1 4 c
10 43 a,b,d,f
a c count(distinct rand())
mysql-test/t/group_by.test
View file @
dccac583
...
...
@@ -346,3 +346,11 @@ select a, MAX(b), CONCAT_WS(MAX(b), '43', '4', '5') from t1 group by a;
select
a
,
MAX
(
b
),
ELT
(
MAX
(
b
),
'a'
,
'b'
,
'c'
,
'd'
,
'e'
,
'f'
)
from
t1
group
by
a
;
select
a
,
MAX
(
b
),
MAKE_SET
(
MAX
(
b
),
'a'
,
'b'
,
'c'
,
'd'
,
'e'
,
'f'
,
'g'
,
'h'
)
from
t1
group
by
a
;
drop
table
t1
;
# not purely group_by bug, but group_by is involved...
create
table
t1
(
a
date
default
null
,
b
date
default
null
);
insert
t1
values
(
'1999-10-01'
,
'2000-01-10'
),
(
'1997-01-01'
,
'1998-10-01'
);
select
a
,
min
(
b
)
c
,
count
(
distinct
rand
())
from
t1
group
by
a
having
c
<
a
+
interval
1
day
;
drop
table
t1
;
sql/item.cc
View file @
dccac583
...
...
@@ -194,6 +194,17 @@ bool Item_field::get_date(TIME *ltime,bool fuzzydate)
return
0
;
}
bool
Item_field
::
get_date_result
(
TIME
*
ltime
,
bool
fuzzydate
)
{
if
((
null_value
=
result_field
->
is_null
())
||
result_field
->
get_date
(
ltime
,
fuzzydate
))
{
bzero
((
char
*
)
ltime
,
sizeof
(
*
ltime
));
return
1
;
}
return
0
;
}
bool
Item_field
::
get_time
(
TIME
*
ltime
)
{
if
((
null_value
=
field
->
is_null
())
||
field
->
get_time
(
ltime
))
...
...
sql/item.h
View file @
dccac583
...
...
@@ -82,6 +82,8 @@ public:
virtual
void
split_sum_func
(
List
<
Item
>
&
fields
)
{}
virtual
bool
get_date
(
TIME
*
ltime
,
bool
fuzzydate
);
virtual
bool
get_time
(
TIME
*
ltime
);
virtual
bool
get_date_result
(
TIME
*
ltime
,
bool
fuzzydate
)
{
return
get_date
(
ltime
,
fuzzydate
);
}
};
...
...
@@ -130,6 +132,7 @@ public:
}
Field
*
tmp_table_field
()
{
return
result_field
;
}
bool
get_date
(
TIME
*
ltime
,
bool
fuzzydate
);
bool
get_date_result
(
TIME
*
ltime
,
bool
fuzzydate
);
bool
get_time
(
TIME
*
ltime
);
};
...
...
@@ -333,7 +336,7 @@ public:
}
bool
get_date
(
TIME
*
ltime
,
bool
fuzzydate
)
{
return
(
null_value
=
(
*
ref
)
->
get_date
(
ltime
,
fuzzydate
));
return
(
null_value
=
(
*
ref
)
->
get_date
_result
(
ltime
,
fuzzydate
));
}
bool
send
(
String
*
tmp
)
{
return
(
*
ref
)
->
send
(
tmp
);
}
void
make_field
(
Send_field
*
field
)
{
(
*
ref
)
->
make_field
(
field
);
}
...
...
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