database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2018-06-30 16:39:20 +02:00
parent 7c0779da7c 1dd3c8f8ba
commit 36e59752e7
273 changed files with 4467 additions and 1284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_explain.cc
View File

@ -1693,7 +1693,7 @@ void Explain_table_access::print_explain_json(Explain_query *query,
{
/* Get r_filtered value from filesort */
if (pre_join_sort->tracker.get_r_loops())
writer->add_double(pre_join_sort->tracker.get_r_filtered());
writer->add_double(pre_join_sort->tracker.get_r_filtered()*100);
else
writer->add_null();
}
@ -2516,4 +2516,3 @@ void Explain_range_checked_fer::print_json(Json_writer *writer,
writer->end_object();
}
}