diff --git a/sql/sql_analyze_stmt.cc b/sql/sql_analyze_stmt.cc
index 8e67267f6a0..9aed432c2b6 100644
--- a/sql/sql_analyze_stmt.cc
+++ b/sql/sql_analyze_stmt.cc
@@ -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)