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

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-05-02 21:43:24 +03:00
parent 0d6fb43e6d 2370eeb028
commit 158247d3bd
8 changed files with 149 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_analyze_stmt.cc
View File

@ -45,7 +45,7 @@ void Filesort_tracker::print_json_members(Json_writer *writer)
else if (r_limit == 0)
writer->add_str(varied_str);
else
writer->add_ll((longlong) rint(r_limit));
writer->add_ll(r_limit);
}
writer->add_member("r_used_priority_queue");
@ -61,13 +61,13 @@ void Filesort_tracker::print_json_members(Json_writer *writer)
if (!get_r_loops())
writer->add_member("r_output_rows").add_null();
else
writer->add_member("r_output_rows").add_ll((longlong) rint(r_output_rows /
get_r_loops()));
writer->add_member("r_output_rows").add_ll(
(longlong) rint((double)r_output_rows / get_r_loops()));
if (sort_passes)
{
writer->add_member("r_sort_passes").add_ll((longlong) rint(sort_passes /
get_r_loops()));
writer->add_member("r_sort_passes").add_ll(
(longlong) rint((double)sort_passes / get_r_loops()));
}
if (sort_buffer_size != 0)