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
fe4dc96c
Commit
fe4dc96c
authored
May 01, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
parents
cbaf2626
0e20de49
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
144 additions
and
16 deletions
+144
-16
mysql-test/r/olap.result
mysql-test/r/olap.result
+61
-0
mysql-test/r/type_datetime.result
mysql-test/r/type_datetime.result
+7
-9
mysql-test/t/olap.test
mysql-test/t/olap.test
+19
-3
mysql-test/t/type_datetime.test
mysql-test/t/type_datetime.test
+1
-3
sql/item_func.h
sql/item_func.h
+29
-0
sql/sql_select.cc
sql/sql_select.cc
+27
-1
No files found.
mysql-test/r/olap.result
View file @
fe4dc96c
...
...
@@ -607,6 +607,67 @@ x a sum(b)
2006-07-01 NULL 11
NULL NULL 11
drop table t1;
CREATE TABLE t1 (a int, b int);
INSERT INTO t1
VALUES (2,10),(3,30),(2,40),(1,10),(2,30),(1,20),(2,10);
SELECT a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP;
a SUM(b)
1 30
2 90
3 30
NULL 150
SELECT DISTINCT a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP;
a SUM(b)
1 30
2 90
3 30
NULL 150
SELECT a, b, COUNT(*) FROM t1 GROUP BY a,b WITH ROLLUP;
a b COUNT(*)
1 10 1
1 20 1
1 NULL 2
2 10 2
2 30 1
2 40 1
2 NULL 4
3 30 1
3 NULL 1
NULL NULL 7
SELECT DISTINCT a, b, COUNT(*) FROM t1 GROUP BY a,b WITH ROLLUP;
a b COUNT(*)
1 10 1
1 20 1
1 NULL 2
2 10 2
2 30 1
2 40 1
2 NULL 4
3 30 1
3 NULL 1
NULL NULL 7
SELECT 'x', a, SUM(b) FROM t1 GROUP BY 1,2 WITH ROLLUP;
x a SUM(b)
x 1 30
x 2 90
x 3 30
x NULL 150
NULL NULL 150
SELECT DISTINCT 'x', a, SUM(b) FROM t1 GROUP BY 1,2 WITH ROLLUP;
x a SUM(b)
x 1 30
x 2 90
x 3 30
x NULL 150
NULL NULL 150
SELECT DISTINCT 'x', a, SUM(b) FROM t1 GROUP BY 1,2 WITH ROLLUP;
x a SUM(b)
x 1 30
x 2 90
x 3 30
x NULL 150
NULL NULL 150
DROP TABLE t1;
CREATE TABLE t1(id int, type char(1));
INSERT INTO t1 VALUES
(1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),
...
...
mysql-test/r/type_datetime.result
View file @
fe4dc96c
...
...
@@ -221,15 +221,13 @@ f1 f2
select 1 from dual where cast('2001-1-1 2:3:4' as date) = cast('2001-01-01' as datetime);
1
1
select f1, f2, UNIX_TIMESTAMP(f2), UNIX_TIMESTAMP(f1),
f1 > f2, f1 = f2, f1 < f2
from t1;
f1 f2 UNIX_TIMESTAMP(f2) UNIX_TIMESTAMP(f1) f1 > f2 f1 = f2 f1 < f2
2001-01-01 2001-01-01 01:01:01 978300061 978296400 0 0 1
2001-02-05 2001-02-05 00:00:00 981320400 981320400 0 1 0
2001-03-10 2001-03-09 01:01:01 984088861 984171600 1 0 0
2001-04-15 2001-04-15 00:00:00 987282000 987282000 0 1 0
2001-05-20 2001-05-20 01:01:01 990309661 990306000 0 0 1
select f1, f2, f1 > f2, f1 = f2, f1 < f2 from t1;
f1 f2 f1 > f2 f1 = f2 f1 < f2
2001-01-01 2001-01-01 01:01:01 0 0 1
2001-02-05 2001-02-05 00:00:00 0 1 0
2001-03-10 2001-03-09 01:01:01 1 0 0
2001-04-15 2001-04-15 00:00:00 0 1 0
2001-05-20 2001-05-20 01:01:01 0 0 1
drop table t1;
create table t1 (f1 date, f2 datetime, f3 timestamp);
insert into t1 values('2001-01-01','2001-01-01 01:01:01','2001-01-01 01:01:01');
...
...
mysql-test/t/olap.test
View file @
fe4dc96c
...
...
@@ -292,6 +292,25 @@ select left(a,10), a, sum(b) from t1 group by 1,2 with rollup;
select
left
(
a
,
10
)
x
,
a
,
sum
(
b
)
from
t1
group
by
x
,
a
with
rollup
;
drop
table
t1
;
#
# Bug #24856: ROLLUP by const item in a query with DISTINCT
#
CREATE
TABLE
t1
(
a
int
,
b
int
);
INSERT
INTO
t1
VALUES
(
2
,
10
),(
3
,
30
),(
2
,
40
),(
1
,
10
),(
2
,
30
),(
1
,
20
),(
2
,
10
);
SELECT
a
,
SUM
(
b
)
FROM
t1
GROUP
BY
a
WITH
ROLLUP
;
SELECT
DISTINCT
a
,
SUM
(
b
)
FROM
t1
GROUP
BY
a
WITH
ROLLUP
;
SELECT
a
,
b
,
COUNT
(
*
)
FROM
t1
GROUP
BY
a
,
b
WITH
ROLLUP
;
SELECT
DISTINCT
a
,
b
,
COUNT
(
*
)
FROM
t1
GROUP
BY
a
,
b
WITH
ROLLUP
;
SELECT
'x'
,
a
,
SUM
(
b
)
FROM
t1
GROUP
BY
1
,
2
WITH
ROLLUP
;
SELECT
DISTINCT
'x'
,
a
,
SUM
(
b
)
FROM
t1
GROUP
BY
1
,
2
WITH
ROLLUP
;
SELECT
DISTINCT
'x'
,
a
,
SUM
(
b
)
FROM
t1
GROUP
BY
1
,
2
WITH
ROLLUP
;
DROP
TABLE
t1
;
# End of 4.1 tests
#
...
...
@@ -339,6 +358,3 @@ SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) as t;
DROP
TABLE
t1
;
mysql-test/t/type_datetime.test
View file @
fe4dc96c
...
...
@@ -157,9 +157,7 @@ select f1, f3 from t1 where f1 >= '2001-02-05 00:00:00' and f3 <= '2001-04-15';
select
f1
,
f3
from
t1
where
f1
>=
'2001-2-5 0:0:0'
and
f2
<=
'2001-4-15'
;
select
f1
,
f2
from
t1
where
if
(
1
,
f1
,
0
)
>=
f2
;
select
1
from
dual
where
cast
(
'2001-1-1 2:3:4'
as
date
)
=
cast
(
'2001-01-01'
as
datetime
);
select
f1
,
f2
,
UNIX_TIMESTAMP
(
f2
),
UNIX_TIMESTAMP
(
f1
),
f1
>
f2
,
f1
=
f2
,
f1
<
f2
from
t1
;
select
f1
,
f2
,
f1
>
f2
,
f1
=
f2
,
f1
<
f2
from
t1
;
drop
table
t1
;
#
...
...
sql/item_func.h
View file @
fe4dc96c
...
...
@@ -741,6 +741,35 @@ class Item_func_max :public Item_func_min_max
};
/*
Objects of this class are used for ROLLUP queries to wrap up
each constant item referred to in GROUP BY list.
*/
class
Item_func_rollup_const
:
public
Item_func
{
public:
Item_func_rollup_const
(
Item
*
a
)
:
Item_func
(
a
)
{
name
=
a
->
name
;
name_length
=
a
->
name_length
;
}
double
val_real
()
{
return
args
[
0
]
->
val_real
();
}
longlong
val_int
()
{
return
args
[
0
]
->
val_int
();
}
String
*
val_str
(
String
*
str
)
{
return
args
[
0
]
->
val_str
(
str
);
}
my_decimal
*
val_decimal
(
my_decimal
*
dec
)
{
return
args
[
0
]
->
val_decimal
(
dec
);
}
const
char
*
func_name
()
const
{
return
"rollup_const"
;
}
bool
const_item
()
const
{
return
0
;
}
Item_result
result_type
()
const
{
return
args
[
0
]
->
result_type
();
}
void
fix_length_and_dec
()
{
collation
=
args
[
0
]
->
collation
;
max_length
=
args
[
0
]
->
max_length
;
decimals
=
args
[
0
]
->
decimals
;
}
};
class
Item_func_length
:
public
Item_int_func
{
String
value
;
...
...
sql/sql_select.cc
View file @
fe4dc96c
...
...
@@ -14804,7 +14804,7 @@ bool JOIN::rollup_init()
for
(
j
=
0
;
j
<
fields_list
.
elements
;
j
++
)
rollup
.
fields
[
i
].
push_back
(
rollup
.
null_items
[
i
]);
}
List_iterator
_fast
<
Item
>
it
(
all_fields
);
List_iterator
<
Item
>
it
(
all_fields
);
Item
*
item
;
while
((
item
=
it
++
))
{
...
...
@@ -14817,6 +14817,32 @@ bool JOIN::rollup_init()
{
item
->
maybe_null
=
1
;
found_in_group
=
1
;
if
(
item
->
const_item
())
{
/*
For ROLLUP queries each constant item referenced in GROUP BY list
is wrapped up into an Item_func object yielding the same value
as the constant item. The objects of the wrapper class are never
considered as constant items and besides they inherit all
properties of the Item_result_field class.
This wrapping allows us to ensure writing constant items
into temporary tables whenever the result of the ROLLUP
operation has to be written into a temporary table, e.g. when
ROLLUP is used together with DISTINCT in the SELECT list.
Usually when creating temporary tables for a intermidiate
result we do not include fields for constant expressions.
*/
Item
*
new_item
=
new
Item_func_rollup_const
(
item
);
if
(
!
new_item
)
return
1
;
new_item
->
fix_fields
(
thd
,
(
Item
**
)
0
);
thd
->
change_item_tree
(
it
.
ref
(),
new_item
);
for
(
ORDER
*
tmp
=
group_tmp
;
tmp
;
tmp
=
tmp
->
next
)
{
if
(
*
tmp
->
item
==
item
)
thd
->
change_item_tree
(
tmp
->
item
,
new_item
);
}
}
}
}
if
(
item
->
type
()
==
Item
::
FUNC_ITEM
&&
!
found_in_group
)
...
...
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