database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix bug in SELECT EXPLAIN ... ORDER BY

Browse Source 
Docs/internals.texi:
  Added more code style suggestions.
Docs/manual.texi:
  Changelog
myisam/mi_check.c:
  Removed dbug info
This commit is contained in:
unknown
2001-09-18 22:13:35 +03:00
parent c91a3df5c3
commit c66208cfbf
4 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_select.cc
View File

@ -531,8 +531,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
if (!(select_options & SELECT_BIG_RESULT) &&
((group && join.const_tables != join.tables &&
!test_if_skip_sort_order(&join.join_tab[join.const_tables], group,
HA_POS_ERROR)) ||
(!simple_group ||
!test_if_skip_sort_order(&join.join_tab[join.const_tables], group,
HA_POS_ERROR))) ||
select_distinct) &&
join.tmp_table_param.quick_group && !procedure)
{
@ -545,8 +546,10 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
order=group;
if (order &&
(join.const_tables == join.tables ||
test_if_skip_sort_order(&join.join_tab[join.const_tables], order,
(group ? HA_POS_ERROR : thd->select_limit))))
(simple_order &&
test_if_skip_sort_order(&join.join_tab[join.const_tables], order,
(group ? HA_POS_ERROR :
thd->select_limit)))))
order=0;
select_describe(&join,need_tmp,
(order != 0 &&