1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 10.3 into 10.4

This commit is contained in:
Marko Mäkelä
2018-10-17 19:11:42 +03:00
59 changed files with 972 additions and 244 deletions

View File

@@ -542,6 +542,11 @@ void Item_sum_hybrid_simple::update_field()
void Item_window_func::print(String *str, enum_query_type query_type)
{
if (only_single_element_order_list())
{
print_for_percentile_functions(str, query_type);
return;
}
window_func()->print(str, query_type);
str->append(" over ");
#ifndef DBUG_OFF
@@ -551,3 +556,15 @@ void Item_window_func::print(String *str, enum_query_type query_type)
#endif
window_spec->print(str, query_type);
}
void Item_window_func::print_for_percentile_functions(String *str, enum_query_type query_type)
{
window_func()->print(str, query_type);
str->append(" within group ");
str->append('(');
window_spec->print_order(str,query_type);
str->append(')');
str->append(" over ");
str->append('(');
window_spec->print_partition(str,query_type);
str->append(')');
}