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
476a0c0f
Commit
476a0c0f
authored
Aug 28, 2003
by
serg@serg.mylan
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents
17d8cc22
4808a6d9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
sql/sql_select.cc
sql/sql_select.cc
+3
-3
No files found.
sql/sql_select.cc
View file @
476a0c0f
...
@@ -906,9 +906,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
...
@@ -906,9 +906,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
if
(
join
.
group
||
join
.
tmp_table_param
.
sum_func_count
||
if
(
join
.
group
||
join
.
tmp_table_param
.
sum_func_count
||
(
procedure
&&
(
procedure
->
flags
&
PROC_GROUP
)))
(
procedure
&&
(
procedure
->
flags
&
PROC_GROUP
)))
{
{
alloc_group_fields
(
&
join
,
group
);
if
(
alloc_group_fields
(
&
join
,
group
)
||
setup_copy_fields
(
thd
,
&
join
.
tmp_table_param
,
all_fields
);
setup_copy_fields
(
thd
,
&
join
.
tmp_table_param
,
all_fields
)
||
if
(
make_sum_func_list
(
&
join
,
all_fields
)
||
thd
->
fatal_error
)
make_sum_func_list
(
&
join
,
all_fields
)
||
thd
->
fatal_error
)
goto
err
;
/* purecov: inspected */
goto
err
;
/* purecov: inspected */
}
}
if
(
group
||
order
)
if
(
group
||
order
)
...
...
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