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

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-06-21 23:47:39 +02:00
parent fe3f9fa918 c09a8b5b36
commit b942aa34c1
185 changed files with 2884 additions and 1966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_explain.cc
View File

@ -1641,7 +1641,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();
}
@ -2460,4 +2460,3 @@ void Explain_range_checked_fer::print_json(Json_writer *writer,
writer->end_object();
}
}