diff options
| -rw-r--r-- | mysql-test/main/cte_recursive.result | 4 | ||||
| -rw-r--r-- | mysql-test/main/derived_cond_pushdown.result | 6 | ||||
| -rw-r--r-- | mysql-test/main/explain_json.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/set_operation.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/table_value_constr.result | 24 | ||||
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/table_value_constr.result | 24 | ||||
| -rw-r--r-- | sql/sql_explain.cc | 38 |
7 files changed, 20 insertions, 80 deletions
diff --git a/mysql-test/main/cte_recursive.result b/mysql-test/main/cte_recursive.result index e2ca6d0b118..53b6545ca38 100644 --- a/mysql-test/main/cte_recursive.result +++ b/mysql-test/main/cte_recursive.result @@ -4122,10 +4122,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<union1,4>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { diff --git a/mysql-test/main/derived_cond_pushdown.result b/mysql-test/main/derived_cond_pushdown.result index b990db091c7..4901c519033 100644 --- a/mysql-test/main/derived_cond_pushdown.result +++ b/mysql-test/main/derived_cond_pushdown.result @@ -12266,8 +12266,6 @@ EXPLAIN "materialized": { "query_block": { "union_result": { - "table_name": "<union2,3>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -16865,8 +16863,6 @@ EXPLAIN "materialized": { "query_block": { "union_result": { - "table_name": "<union2,3>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -17115,8 +17111,6 @@ EXPLAIN "materialized": { "query_block": { "union_result": { - "table_name": "<union2,3,4>", - "access_type": "ALL", "query_specifications": [ { "query_block": { diff --git a/mysql-test/main/explain_json.result b/mysql-test/main/explain_json.result index a107fa3a6ff..cf1aa172146 100644 --- a/mysql-test/main/explain_json.result +++ b/mysql-test/main/explain_json.result @@ -303,8 +303,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", "query_specifications": [ { "query_block": { diff --git a/mysql-test/main/set_operation.result b/mysql-test/main/set_operation.result index c74179afe41..b740f7387c5 100644 --- a/mysql-test/main/set_operation.result +++ b/mysql-test/main/set_operation.result @@ -638,8 +638,6 @@ EXPLAIN "materialized": { "query_block": { "union_result": { - "table_name": "<union5,6>", - "access_type": "ALL", "query_specifications": [ { "query_block": { diff --git a/mysql-test/main/table_value_constr.result b/mysql-test/main/table_value_constr.result index 0522e6ae6cc..b90b5c86c15 100644 --- a/mysql-test/main/table_value_constr.result +++ b/mysql-test/main/table_value_constr.result @@ -1304,8 +1304,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<unit1>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -1525,8 +1523,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -1589,8 +1585,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -1633,8 +1627,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<union1,2,3>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -1677,10 +1669,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<unit1>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { @@ -1908,10 +1896,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { @@ -1976,10 +1960,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { @@ -2022,10 +2002,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<union1,2,3>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { diff --git a/mysql-test/suite/compat/oracle/r/table_value_constr.result b/mysql-test/suite/compat/oracle/r/table_value_constr.result index 108163ed782..365edaa7757 100644 --- a/mysql-test/suite/compat/oracle/r/table_value_constr.result +++ b/mysql-test/suite/compat/oracle/r/table_value_constr.result @@ -1302,8 +1302,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<unit1>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -1523,8 +1521,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -1587,8 +1583,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -1631,8 +1625,6 @@ EXPLAIN { "query_block": { "union_result": { - "table_name": "<union1,2,3>", - "access_type": "ALL", "query_specifications": [ { "query_block": { @@ -1675,10 +1667,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<unit1>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { @@ -1906,10 +1894,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { @@ -1974,10 +1958,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<union1,2>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { @@ -2020,10 +2000,6 @@ ANALYZE { "query_block": { "union_result": { - "table_name": "<union1,2,3>", - "access_type": "ALL", - "r_loops": 0, - "r_rows": null, "query_specifications": [ { "query_block": { diff --git a/sql/sql_explain.cc b/sql/sql_explain.cc index 4fd4e6d3b77..3cee9bbb2c5 100644 --- a/sql/sql_explain.cc +++ b/sql/sql_explain.cc @@ -606,27 +606,29 @@ void Explain_union::print_explain_json(Explain_query *query, else writer->add_member("union_result").start_object(); - // using_temporary_table - make_union_table_name(table_name_buffer); - writer->add_member("table_name").add_str(table_name_buffer); - writer->add_member("access_type").add_str("ALL"); // not very useful - - /* r_loops (not present in tabular output) */ - if (is_analyze) + if (using_tmp) { - writer->add_member("r_loops").add_ll(fake_select_lex_tracker.get_loops()); - } + make_union_table_name(table_name_buffer); + writer->add_member("table_name").add_str(table_name_buffer); + writer->add_member("access_type").add_str("ALL"); // not very useful - /* `r_rows` */ - if (is_analyze) - { - writer->add_member("r_rows"); - if (fake_select_lex_tracker.has_scans()) - writer->add_double(fake_select_lex_tracker.get_avg_rows()); - else - writer->add_null(); - } + /* r_loops (not present in tabular output) */ + if (is_analyze) + { + writer->add_member("r_loops").add_ll( + fake_select_lex_tracker.get_loops()); + } + /* `r_rows` */ + if (is_analyze) + { + writer->add_member("r_rows"); + if (fake_select_lex_tracker.has_scans()) + writer->add_double(fake_select_lex_tracker.get_avg_rows()); + else + writer->add_null(); + } + } writer->add_member("query_specifications").start_array(); for (int i= 0; i < (int) union_members.elements(); i++) |