From be1d06c8a5f843e775374e5ec148aaee56970bdc Mon Sep 17 00:00:00 2001 From: Galina Shalygina Date: Sun, 8 May 2016 23:04:41 +0300 Subject: Merge branch '10.2' into 10.2-mdev9864 --- mysql-test/r/explain_json.result | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'mysql-test/r/explain_json.result') diff --git a/mysql-test/r/explain_json.result b/mysql-test/r/explain_json.result index 46d586ac29d..af5d1b800aa 100644 --- a/mysql-test/r/explain_json.result +++ b/mysql-test/r/explain_json.result @@ -486,8 +486,8 @@ EXPLAIN "query_block": { "select_id": 2, "filesort": { + "sort_key": "t1.a", "temporary_table": { - "function": "buffer", "table": { "table_name": "t1", "access_type": "ALL", @@ -530,8 +530,8 @@ EXPLAIN "query_block": { "select_id": 2, "filesort": { + "sort_key": "t1.a", "temporary_table": { - "function": "buffer", "table": { "table_name": "t1", "access_type": "ALL", @@ -576,7 +576,6 @@ EXPLAIN "query_block": { "select_id": 2, "temporary_table": { - "function": "buffer", "table": { "table_name": "t1", "access_type": "ALL", @@ -1132,8 +1131,8 @@ EXPLAIN "select_id": 1, "having_condition": "(TOP > t2.a)", "filesort": { + "sort_key": "t2.a", "temporary_table": { - "function": "buffer", "table": { "table_name": "t2", "access_type": "ALL", @@ -1151,8 +1150,8 @@ EXPLAIN "query_block": { "select_id": 1, "filesort": { + "sort_key": "t2.a", "temporary_table": { - "function": "buffer", "table": { "table_name": "t2", "access_type": "ALL", @@ -1181,8 +1180,8 @@ EXPLAIN "query_block": { "select_id": 1, "filesort": { + "sort_key": "t2.a", "temporary_table": { - "function": "buffer", "table": { "table_name": "t2", "access_type": "ALL", @@ -1380,7 +1379,6 @@ EXPLAIN "query_block": { "select_id": 1, "temporary_table": { - "function": "buffer", "table": { "table_name": "t1", "access_type": "ALL", -- cgit v1.2.1