From: Tor Didriksen Date: October 13 2011 1:23pm Subject: bzr push into mysql-trunk branch (tor.didriksen:3462 to 3463) List-Archive: http://lists.mysql.com/commits/141429 Message-Id: <201110131323.p9DDNEjW008102@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3463 Tor Didriksen 2011-10-13 "records" => "rows" in opt-trace/filesort modified: mysql-test/suite/opt_trace/r/filesort_pq.result mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/general_no_prot_all.result mysql-test/suite/opt_trace/r/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_all.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/opt_trace/r/subquery_no_prot.result mysql-test/suite/opt_trace/r/subquery_ps_prot.result sql/filesort.cc 3462 Tor Didriksen 2011-10-13 new test results after backporting and merge dance modified: mysql-test/suite/opt_trace/r/general_no_prot_all.result mysql-test/suite/opt_trace/r/general_ps_prot_all.result === modified file 'mysql-test/suite/opt_trace/r/filesort_pq.result' --- a/mysql-test/suite/opt_trace/r/filesort_pq.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/filesort_pq.result 2011-10-13 13:22:45 +0000 @@ -257,8 +257,8 @@ SELECT * FROM t1 ORDER BY f1 ASC, f0 LIM ], "filesort_priority_queue_optimization": { "limit": 100, - "records_estimate": 110, - "record_size": 220, + "rows_estimate": 110, + "row_size": 220, "memory_available": 262144, "chosen": false, "cause": "quicksort_is_cheaper" @@ -266,7 +266,8 @@ SELECT * FROM t1 ORDER BY f1 ASC, f0 LIM "filesort_execution": [ ], "filesort_summary": { - "records": 100, + "rows": 100, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -434,15 +435,16 @@ SELECT * FROM t1 ORDER BY f1 ASC, f0 LIM ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 110, - "record_size": 220, + "rows_estimate": 110, + "row_size": 220, "memory_available": 262144, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -645,15 +647,16 @@ SELECT * FROM t1 ORDER BY f2 DESC, f0 LI ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 262144, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -870,15 +873,16 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2 ], "filesort_priority_queue_optimization": { "limit": 20, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 262144, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 21, + "rows": 21, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -1105,15 +1109,16 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2 ], "filesort_priority_queue_optimization": { "limit": 20, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 262144, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 21, + "rows": 21, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -1275,15 +1280,16 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2 ], "filesort_priority_queue_optimization": { "limit": 10, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 262144, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 11, + "rows": 11, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -1412,15 +1418,16 @@ SELECT CONCAT("hello ", f2) AS foo FROM ], "filesort_priority_queue_optimization": { "limit": 2, - "records_estimate": 110, - "record_size": 410, + "rows_estimate": 110, + "row_size": 410, "memory_available": 262144, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 3, + "rows": 3, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -1548,15 +1555,16 @@ SELECT * from t1 ORDER BY rand(2) LIMIT ], "filesort_priority_queue_optimization": { "limit": 2, - "records_estimate": 110, - "record_size": 16, + "rows_estimate": 110, + "row_size": 16, "memory_available": 262144, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 3, + "rows": 3, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -1725,15 +1733,16 @@ SELECT * FROM t1 ORDER BY f1 ASC, f0 LIM ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 110, - "record_size": 220, + "rows_estimate": 110, + "row_size": 220, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -1936,15 +1945,16 @@ SELECT * FROM t1 ORDER BY f2 DESC, f0 LI ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -2161,15 +2171,16 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2 ], "filesort_priority_queue_optimization": { "limit": 20, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 21, + "rows": 21, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -2396,15 +2407,16 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2 ], "filesort_priority_queue_optimization": { "limit": 20, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 21, + "rows": 21, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -2566,15 +2578,16 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2 ], "filesort_priority_queue_optimization": { "limit": 10, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 11, + "rows": 11, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -2750,15 +2763,16 @@ ORDER BY f1, f0 LIMIT 30 { ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 110, - "record_size": 220, + "rows_estimate": 110, + "row_size": 220, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -2901,15 +2915,16 @@ ORDER BY f1, f0 LIMIT 0 { ], "filesort_priority_queue_optimization": { "limit": 0, - "records_estimate": 110, - "record_size": 220, + "rows_estimate": 110, + "row_size": 220, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 1, + "rows": 1, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -3096,15 +3111,16 @@ ORDER BY f2, f0 LIMIT 20 { ], "filesort_priority_queue_optimization": { "limit": 20, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 21, + "rows": 21, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -3271,15 +3287,16 @@ ORDER BY f2, f0 LIMIT 0 { ], "filesort_priority_queue_optimization": { "limit": 0, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 1, + "rows": 1, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -3456,15 +3473,16 @@ ORDER BY f2, f0 LIMIT 10 OFFSET 10 { ], "filesort_priority_queue_optimization": { "limit": 20, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 21, + "rows": 21, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -3631,15 +3649,16 @@ ORDER BY f2, f0 LIMIT 0 OFFSET 10 { ], "filesort_priority_queue_optimization": { "limit": 10, - "records_estimate": 110, - "record_size": 416, + "rows_estimate": 110, + "row_size": 416, "memory_available": 32768, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 11, + "rows": 11, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -3912,15 +3931,16 @@ ORDER BY tmp.f1, f0 LIMIT 30 { ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 1510, - "record_size": 17, + "rows_estimate": 1510, + "row_size": 17, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 1500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -4185,15 +4205,16 @@ ORDER BY tmp.f1, f0 LIMIT 30 OFFSET 30 { ], "filesort_priority_queue_optimization": { "limit": 60, - "records_estimate": 1510, - "record_size": 17, + "rows_estimate": 1510, + "row_size": 17, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 61, + "rows": 61, + "examined_rows": 1500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -4463,15 +4484,16 @@ ORDER BY tmp.f1, f0 LIMIT 30 OFFSET 30 { ], "filesort_priority_queue_optimization": { "limit": 60, - "records_estimate": 1510, - "record_size": 17, + "rows_estimate": 1510, + "row_size": 17, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 61, + "rows": 61, + "examined_rows": 1500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -4769,15 +4791,16 @@ ORDER BY tmp.f1, f0 LIMIT 30 OFFSET 30 { ], "filesort_priority_queue_optimization": { "limit": 60, - "records_estimate": 1195, - "record_size": 17, + "rows_estimate": 1195, + "row_size": 17, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 61, + "rows": 61, + "examined_rows": 1185, "number_of_tmp_files": 0, "sort_mode": "" } @@ -5075,15 +5098,16 @@ SELECT * FROM v1 { ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 510, - "record_size": 220, + "rows_estimate": 510, + "row_size": 220, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -5370,15 +5394,16 @@ SELECT * FROM v1 ORDER BY f2, f0 LIMIT 3 ], "filesort_priority_queue_optimization": { "limit": 100, - "records_estimate": 510, - "record_size": 220, + "rows_estimate": 510, + "row_size": 220, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 101, + "rows": 101, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -5403,15 +5428,16 @@ SELECT * FROM v1 ORDER BY f2, f0 LIMIT 3 ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 110, - "record_size": 213, + "rows_estimate": 110, + "row_size": 213, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -6002,15 +6028,16 @@ LIMIT 30 { ], "filesort_priority_queue_optimization": { "limit": 100, - "records_estimate": 510, - "record_size": 220, + "rows_estimate": 510, + "row_size": 220, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 101, + "rows": 101, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -6039,15 +6066,16 @@ LIMIT 30 { ], "filesort_priority_queue_optimization": { "limit": 100, - "records_estimate": 510, - "record_size": 416, + "rows_estimate": 510, + "row_size": 416, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 101, + "rows": 101, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -6078,15 +6106,16 @@ LIMIT 30 { ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 335, - "record_size": 217, + "rows_estimate": 335, + "row_size": 217, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 325, "number_of_tmp_files": 0, "sort_mode": "" } @@ -6244,15 +6273,16 @@ GROUP BY 1 ORDER BY 2,1 LIMIT 5 { ], "filesort_priority_queue_optimization": { "limit": 5, - "records_estimate": 20, - "record_size": 25, + "rows_estimate": 20, + "row_size": 25, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 6, + "rows": 6, + "examined_rows": 10, "number_of_tmp_files": 0, "sort_mode": "" } @@ -6493,15 +6523,16 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2 ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 510, - "record_size": 416, + "rows_estimate": 510, + "row_size": 416, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -6676,15 +6707,16 @@ SELECT * FROM t1 WHERE f1>10 ORDER BY f2 ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 510, - "record_size": 416, + "rows_estimate": 510, + "row_size": 416, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -6860,15 +6892,16 @@ ORDER BY f2, f0 LIMIT 15 OFFSET 15 { ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 510, - "record_size": 416, + "rows_estimate": 510, + "row_size": 416, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -7150,15 +7183,16 @@ SELECT * FROM v1 ORDER BY f2, f0 LIMIT 3 ], "filesort_priority_queue_optimization": { "limit": 100, - "records_estimate": 510, - "record_size": 220, + "rows_estimate": 510, + "row_size": 220, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 101, + "rows": 101, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -7183,15 +7217,16 @@ SELECT * FROM v1 ORDER BY f2, f0 LIMIT 3 ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 110, - "record_size": 213, + "rows_estimate": 110, + "row_size": 213, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 100, "number_of_tmp_files": 0, "sort_mode": "" } @@ -7545,15 +7580,16 @@ ORDER BY d1.f2 DESC LIMIT 30 { ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 510, - "record_size": 216, + "rows_estimate": 510, + "row_size": 216, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -7572,15 +7608,16 @@ ORDER BY d1.f2 DESC LIMIT 30 { ], "filesort_priority_queue_optimization": { "limit": 30, - "records_estimate": 630, - "record_size": 209, + "rows_estimate": 630, + "row_size": 209, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 31, + "rows": 31, + "examined_rows": 620, "number_of_tmp_files": 0, "sort_mode": "" } @@ -7833,15 +7870,16 @@ SELECT * FROM t1 WHERE f1 = (SELECT f1 F ], "filesort_priority_queue_optimization": { "limit": 1, - "records_estimate": 510, - "record_size": 10, + "rows_estimate": 510, + "row_size": 10, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -11588,15 +11626,16 @@ SELECT * FROM t1 WHERE f1 = (SELECT f1 F ], "filesort_priority_queue_optimization": { "limit": 2, - "records_estimate": 510, - "record_size": 10, + "rows_estimate": 510, + "row_size": 10, "memory_available": 327680, "chosen": true }, "filesort_execution": [ ], "filesort_summary": { - "records": 3, + "rows": 3, + "examined_rows": 500, "number_of_tmp_files": 0, "sort_mode": "" } @@ -11848,11 +11887,11 @@ SELECT * FROM t1 ORDER BY f2 LIMIT 100 { ], "filesort_priority_queue_optimization": { "limit": 100, - "records_estimate": 438510, - "record_size": 412, + "rows_estimate": 438510, + "row_size": 412, "memory_available": 32768, "strip_additional_fields": { - "record_size": 215, + "row_size": 215, "sort_merge_cost": 909261, "priority_queue_cost": 714335, "chosen": true @@ -11861,7 +11900,8 @@ SELECT * FROM t1 ORDER BY f2 LIMIT 100 { "filesort_execution": [ ], "filesort_summary": { - "records": 101, + "rows": 101, + "examined_rows": 438500, "number_of_tmp_files": 0, "sort_mode": "" } === modified file 'mysql-test/suite/opt_trace/r/general2_no_prot.result' --- a/mysql-test/suite/opt_trace/r/general2_no_prot.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/general2_no_prot.result 2011-10-13 13:22:45 +0000 @@ -1116,7 +1116,8 @@ TRACE } ] /* filesort_execution */, "filesort_summary": { - "records": 4, + "rows": 4, + "examined_rows": 4, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ @@ -1350,7 +1351,8 @@ TRACE "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 3, + "rows": 3, + "examined_rows": 3, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ @@ -4855,7 +4857,8 @@ GROUP BY field2 ORDER BY alias1.col_int_ "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 8, + "rows": 8, + "examined_rows": 8, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/general2_ps_prot.result' --- a/mysql-test/suite/opt_trace/r/general2_ps_prot.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/general2_ps_prot.result 2011-10-13 13:22:45 +0000 @@ -1134,7 +1134,8 @@ TRACE } ] /* filesort_execution */, "filesort_summary": { - "records": 4, + "rows": 4, + "examined_rows": 4, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ @@ -1368,7 +1369,8 @@ TRACE "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 3, + "rows": 3, + "examined_rows": 3, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ @@ -4908,7 +4910,8 @@ GROUP BY field2 ORDER BY alias1.col_int_ "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 8, + "rows": 8, + "examined_rows": 8, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/general_no_prot_all.result' --- a/mysql-test/suite/opt_trace/r/general_no_prot_all.result 2011-10-13 12:03:02 +0000 +++ b/mysql-test/suite/opt_trace/r/general_no_prot_all.result 2011-10-13 13:22:45 +0000 @@ -6385,7 +6385,8 @@ trace "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 2, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/general_no_prot_none.result' --- a/mysql-test/suite/opt_trace/r/general_no_prot_none.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/general_no_prot_none.result 2011-10-13 13:22:45 +0000 @@ -5832,7 +5832,8 @@ trace "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 2, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/general_ps_prot_all.result' --- a/mysql-test/suite/opt_trace/r/general_ps_prot_all.result 2011-10-13 12:03:02 +0000 +++ b/mysql-test/suite/opt_trace/r/general_ps_prot_all.result 2011-10-13 13:22:45 +0000 @@ -6353,7 +6353,8 @@ trace "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 2, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/general_ps_prot_none.result' --- a/mysql-test/suite/opt_trace/r/general_ps_prot_none.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/general_ps_prot_none.result 2011-10-13 13:22:45 +0000 @@ -5790,7 +5790,8 @@ trace "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 2, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/range_no_prot.result' --- a/mysql-test/suite/opt_trace/r/range_no_prot.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/range_no_prot.result 2011-10-13 13:22:45 +0000 @@ -4704,7 +4704,8 @@ SELECT * from t1 where topic = all (SELE "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 2, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ @@ -4739,7 +4740,8 @@ SELECT * from t1 where topic = all (SELE "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 2, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/range_ps_prot.result' --- a/mysql-test/suite/opt_trace/r/range_ps_prot.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/range_ps_prot.result 2011-10-13 13:22:45 +0000 @@ -4694,7 +4694,8 @@ SELECT * from t1 where topic = all (SELE "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 2, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ @@ -4729,7 +4730,8 @@ SELECT * from t1 where topic = all (SELE "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 2, + "rows": 2, + "examined_rows": 2, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/subquery_no_prot.result' --- a/mysql-test/suite/opt_trace/r/subquery_no_prot.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/subquery_no_prot.result 2011-10-13 13:22:45 +0000 @@ -1629,7 +1629,8 @@ field4,field5,field6 { "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 0, + "rows": 0, + "examined_rows": 0, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'mysql-test/suite/opt_trace/r/subquery_ps_prot.result' --- a/mysql-test/suite/opt_trace/r/subquery_ps_prot.result 2011-10-05 13:16:38 +0000 +++ b/mysql-test/suite/opt_trace/r/subquery_ps_prot.result 2011-10-13 13:22:45 +0000 @@ -1619,7 +1619,8 @@ field4,field5,field6 { "filesort_execution": [ ] /* filesort_execution */, "filesort_summary": { - "records": 0, + "rows": 0, + "examined_rows": 0, "number_of_tmp_files": 0, "sort_mode": "" } /* filesort_summary */ === modified file 'sql/filesort.cc' --- a/sql/filesort.cc 2011-09-19 11:29:21 +0000 +++ b/sql/filesort.cc 2011-10-13 13:22:45 +0000 @@ -314,7 +314,8 @@ ha_rows filesort(THD *thd, TABLE *table, maxbuffer= (uint) (my_b_tell(&buffpek_pointers)/sizeof(*buffpek)); Opt_trace_object(trace, "filesort_summary") - .add("records", num_rows) + .add("rows", num_rows) + .add("examined_rows", param.examined_rows) .add("number_of_tmp_files", maxbuffer) .add_alnum("sort_mode", param.addon_field ? @@ -1223,8 +1224,8 @@ bool check_if_pq_applicable(Opt_trace_co trace_filesort .add("limit", param->max_rows) - .add("records_estimate", num_rows) - .add("record_size", param->rec_length) + .add("rows_estimate", num_rows) + .add("row_size", param->rec_length) .add("memory_available", memory_available); if (param->max_rows + 2 >= UINT_MAX) @@ -1274,7 +1275,7 @@ bool check_if_pq_applicable(Opt_trace_co num_available_keys= memory_available / row_length; Opt_trace_object trace_addon(trace, "strip_additional_fields"); - trace_addon.add("record_size", row_length); + trace_addon.add("row_size", row_length); // Can we fit all the keys in memory? if (param->max_keys_per_buffer >= num_available_keys) No bundle (reason: useless for push emails).