1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä
2020-05-26 11:54:55 +03:00
47 changed files with 1104 additions and 347 deletions

View File

@ -2761,11 +2761,16 @@ int JOIN::optimize_stage2()
}
need_tmp= test_if_need_tmp_table();
//TODO this could probably go in test_if_need_tmp_table.
if (this->select_lex->window_specs.elements > 0) {
need_tmp= TRUE;
/*
If window functions are present then we can't have simple_order set to
TRUE as the window function needs a temp table for computation.
ORDER BY is computed after the window function computation is done, so
the sort will be done on the temp table.
*/
if (select_lex->have_window_funcs())
simple_order= FALSE;
}
/*
If the hint FORCE INDEX FOR ORDER BY/GROUP BY is used for the table