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
0d31b4b3
Commit
0d31b4b3
authored
7 years ago
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '10.2' of
https://github.com/mariadb/server
into 10.2
parents
067b90c7
204739df
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
sql/sql_select.cc
sql/sql_select.cc
+2
-0
No files found.
sql/sql_select.cc
View file @
0d31b4b3
...
...
@@ -2910,6 +2910,7 @@ JOIN::create_postjoin_aggr_table(JOIN_TAB *tab, List<Item> *table_fields,
THD_STAGE_INFO
(
thd
,
stage_sorting_for_group
);
if
(
ordered_index_usage
!=
ordered_index_group_by
&&
!
only_const_tables
()
&&
(
join_tab
+
const_tables
)
->
type
!=
JT_CONST
&&
// Don't sort 1 row
!
implicit_grouping
&&
add_sorting_to_table
(
join_tab
+
const_tables
,
group_list
))
...
...
@@ -2943,6 +2944,7 @@ JOIN::create_postjoin_aggr_table(JOIN_TAB *tab, List<Item> *table_fields,
THD_STAGE_INFO
(
thd
,
stage_sorting_for_order
);
if
(
ordered_index_usage
!=
ordered_index_order_by
&&
!
only_const_tables
()
&&
add_sorting_to_table
(
join_tab
+
const_tables
,
order
))
goto
err
;
order
=
NULL
;
...
...
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