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
8c36b3b4
Commit
8c36b3b4
authored
21 years ago
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A fix for bug #176
code cleanup
parent
4b1a877b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
17 deletions
+32
-17
mysql-test/r/having.result
mysql-test/r/having.result
+7
-0
mysql-test/t/having.test
mysql-test/t/having.test
+4
-0
sql/item.cc
sql/item.cc
+1
-0
sql/item_func.cc
sql/item_func.cc
+20
-17
No files found.
mysql-test/r/having.result
View file @
8c36b3b4
...
...
@@ -63,3 +63,10 @@ Fld1 max(Fld2)
1 20
3 50
drop table t1;
create table t1 (id int not null, qty int not null);
insert into t1 values (1,2),(1,3),(2,4),(2,5);
select id, sum(qty) as sqty from t1 group by id having sqty>2;
id sqty
1 5
2 9
drop table t1;
This diff is collapsed.
Click to expand it.
mysql-test/t/having.test
View file @
8c36b3b4
...
...
@@ -60,3 +60,7 @@ select Fld1, max(Fld2) from t1 group by Fld1 having max(Fld2) is not null;
select
Fld1
,
max
(
Fld2
)
from
t1
group
by
Fld1
having
avg
(
Fld2
)
is
not
null
;
select
Fld1
,
max
(
Fld2
)
from
t1
group
by
Fld1
having
std
(
Fld2
)
is
not
null
;
drop
table
t1
;
create
table
t1
(
id
int
not
null
,
qty
int
not
null
);
insert
into
t1
values
(
1
,
2
),(
1
,
3
),(
2
,
4
),(
2
,
5
);
select
id
,
sum
(
qty
)
as
sqty
from
t1
group
by
id
having
sqty
>
2
;
drop
table
t1
;
This diff is collapsed.
Click to expand it.
sql/item.cc
View file @
8c36b3b4
...
...
@@ -665,6 +665,7 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables)
maybe_null
=
(
*
ref
)
->
maybe_null
;
decimals
=
(
*
ref
)
->
decimals
;
binary
=
(
*
ref
)
->
binary
;
with_sum_func
=
(
*
ref
)
->
with_sum_func
;
}
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
sql/item_func.cc
View file @
8c36b3b4
...
...
@@ -70,15 +70,16 @@ Item_func::fix_fields(THD *thd,TABLE_LIST *tables)
{
// Print purify happy
for
(
arg
=
args
,
arg_end
=
args
+
arg_count
;
arg
!=
arg_end
;
arg
++
)
{
if
((
*
arg
)
->
fix_fields
(
thd
,
tables
))
Item
*
item
=*
arg
;
if
(
item
->
fix_fields
(
thd
,
tables
))
return
1
;
/* purecov: inspected */
if
(
(
*
arg
)
->
maybe_null
)
if
(
item
->
maybe_null
)
maybe_null
=
1
;
if
(
(
*
arg
)
->
binary
)
if
(
item
->
binary
)
binary
=
1
;
with_sum_func
=
with_sum_func
||
(
*
arg
)
->
with_sum_func
;
used_tables_cache
|=
(
*
arg
)
->
used_tables
();
const_item_cache
&=
(
*
arg
)
->
const_item
();
with_sum_func
=
with_sum_func
||
item
->
with_sum_func
;
used_tables_cache
|=
item
->
used_tables
();
const_item_cache
&=
item
->
const_item
();
}
}
fix_length_and_dec
();
...
...
@@ -91,12 +92,13 @@ void Item_func::split_sum_func(List<Item> &fields)
Item
**
arg
,
**
arg_end
;
for
(
arg
=
args
,
arg_end
=
args
+
arg_count
;
arg
!=
arg_end
;
arg
++
)
{
if
((
*
arg
)
->
with_sum_func
&&
(
*
arg
)
->
type
()
!=
SUM_FUNC_ITEM
)
(
*
arg
)
->
split_sum_func
(
fields
);
else
if
((
*
arg
)
->
used_tables
()
||
(
*
arg
)
->
type
()
==
SUM_FUNC_ITEM
)
Item
*
item
=*
arg
;
if
(
item
->
with_sum_func
&&
item
->
type
()
!=
SUM_FUNC_ITEM
)
item
->
split_sum_func
(
fields
);
else
if
(
item
->
used_tables
()
||
item
->
type
()
==
SUM_FUNC_ITEM
)
{
fields
.
push_front
(
*
arg
);
*
arg
=
new
Item_ref
((
Item
**
)
fields
.
head_ref
(),
0
,
(
*
arg
)
->
name
);
*
arg
=
new
Item_ref
((
Item
**
)
fields
.
head_ref
(),
0
,
item
->
name
);
}
}
}
...
...
@@ -1231,16 +1233,17 @@ udf_handler::fix_fields(THD *thd,TABLE_LIST *tables,Item_result_field *func,
arg
!=
arg_end
;
arg
++
,
i
++
)
{
if
((
*
arg
)
->
fix_fields
(
thd
,
tables
))
Item
*
item
=*
arg
;
if
(
item
->
fix_fields
(
thd
,
tables
))
return
1
;
if
(
(
*
arg
)
->
binary
)
if
(
item
->
binary
)
func
->
binary
=
1
;
if
(
(
*
arg
)
->
maybe_null
)
if
(
item
->
maybe_null
)
func
->
maybe_null
=
1
;
func
->
with_sum_func
=
func
->
with_sum_func
||
(
*
arg
)
->
with_sum_func
;
used_tables_cache
|=
(
*
arg
)
->
used_tables
();
const_item_cache
&=
(
*
arg
)
->
const_item
();
f_args
.
arg_type
[
i
]
=
(
*
arg
)
->
result_type
();
func
->
with_sum_func
=
func
->
with_sum_func
||
item
->
with_sum_func
;
used_tables_cache
|=
item
->
used_tables
();
const_item_cache
&=
item
->
const_item
();
f_args
.
arg_type
[
i
]
=
item
->
result_type
();
}
if
(
!
(
buffers
=
new
String
[
arg_count
])
||
!
(
f_args
.
args
=
(
char
**
)
sql_alloc
(
arg_count
*
sizeof
(
char
*
)))
||
...
...
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