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
c1bd124c
Commit
c1bd124c
authored
Aug 30, 2010
by
Alexey Kopytov
Browse files
Options
Browse Files
Download
Plain Diff
Automerge.
parents
3bc7c508
d7d0f639
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
21 deletions
+25
-21
mysql-test/r/func_group.result
mysql-test/r/func_group.result
+11
-0
mysql-test/t/func_group.test
mysql-test/t/func_group.test
+14
-0
sql/item_sum.cc
sql/item_sum.cc
+0
-20
sql/item_sum.h
sql/item_sum.h
+0
-1
No files found.
mysql-test/r/func_group.result
View file @
c1bd124c
...
...
@@ -1713,4 +1713,15 @@ f1 f2 f3 f4 f1 = f2
NULL NULL NULL NULL NULL
drop table t1;
#
# Bug #54465: assert: field_types == 0 || field_types[field_pos] ==
# MYSQL_TYPE_LONGLONG
#
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (1), (2);
SELECT MAX((SELECT 1 FROM t1 ORDER BY @var LIMIT 1)) m FROM t1 t2, t1
ORDER BY t1.a;
m
1
DROP TABLE t1;
#
End of 5.1 tests
mysql-test/t/func_group.test
View file @
c1bd124c
...
...
@@ -1082,6 +1082,20 @@ select a.f1 as a, b.f4 as b, a.f1 > b.f4 as gt,
from
t1
a
,
t1
b
;
select
*
,
f1
=
f2
from
t1
;
drop
table
t1
;
--
echo
#
--
echo
# Bug #54465: assert: field_types == 0 || field_types[field_pos] ==
--
echo
# MYSQL_TYPE_LONGLONG
--
echo
#
CREATE
TABLE
t1
(
a
INT
);
INSERT
INTO
t1
VALUES
(
1
),
(
2
);
SELECT
MAX
((
SELECT
1
FROM
t1
ORDER
BY
@
var
LIMIT
1
))
m
FROM
t1
t2
,
t1
ORDER
BY
t1
.
a
;
DROP
TABLE
t1
;
--
echo
#
--
echo
End
of
5.1
tests
sql/item_sum.cc
View file @
c1bd124c
...
...
@@ -417,26 +417,6 @@ void Item_sum::mark_as_sum_func()
}
void
Item_sum
::
make_field
(
Send_field
*
tmp_field
)
{
if
(
args
[
0
]
->
type
()
==
Item
::
FIELD_ITEM
&&
keep_field_type
())
{
((
Item_field
*
)
args
[
0
])
->
field
->
make_field
(
tmp_field
);
/* For expressions only col_name should be non-empty string. */
char
*
empty_string
=
(
char
*
)
""
;
tmp_field
->
db_name
=
empty_string
;
tmp_field
->
org_table_name
=
empty_string
;
tmp_field
->
table_name
=
empty_string
;
tmp_field
->
org_col_name
=
empty_string
;
tmp_field
->
col_name
=
name
;
if
(
maybe_null
)
tmp_field
->
flags
&=
~
NOT_NULL_FLAG
;
}
else
init_make_field
(
tmp_field
,
field_type
());
}
void
Item_sum
::
print
(
String
*
str
,
enum_query_type
query_type
)
{
/* orig_args is not filled with valid values until fix_fields() */
...
...
sql/item_sum.h
View file @
c1bd124c
...
...
@@ -339,7 +339,6 @@ class Item_sum :public Item_result_field
forced_const
=
TRUE
;
}
virtual
bool
const_item
()
const
{
return
forced_const
;
}
void
make_field
(
Send_field
*
field
);
virtual
void
print
(
String
*
str
,
enum_query_type
query_type
);
void
fix_num_length_and_dec
();
...
...
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