diff options
| -rw-r--r-- | mysql-test/r/analyze_format_json.result | 24 | ||||
| -rw-r--r-- | mysql-test/t/analyze_format_json.test | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/mysql-test/r/analyze_format_json.result b/mysql-test/r/analyze_format_json.result index 56d52bb557d..14ab125b9ac 100644 --- a/mysql-test/r/analyze_format_json.result +++ b/mysql-test/r/analyze_format_json.result @@ -487,14 +487,14 @@ ANALYZE "query_block": { "select_id": 1, "r_loops": 1, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "having_condition": "(TOP > a)", "filesort": { "r_loops": 1, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "r_used_priority_queue": false, "r_output_rows": 0, - "r_buffer_size": "5Kb", + "volatile parameter": "REPLACED", "temporary_table": { "table": { "table_name": "t2", @@ -502,7 +502,7 @@ ANALYZE "r_loops": 1, "rows": 256, "r_rows": 256, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "filtered": 100, "r_filtered": 100 } @@ -517,13 +517,13 @@ ANALYZE "query_block": { "select_id": 1, "r_loops": 1, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "filesort": { "r_loops": 1, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "r_used_priority_queue": false, "r_output_rows": 256, - "r_buffer_size": "5Kb", + "volatile parameter": "REPLACED", "temporary_table": { "table": { "table_name": "t2", @@ -531,7 +531,7 @@ ANALYZE "r_loops": 1, "rows": 256, "r_rows": 256, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "filtered": 100, "r_filtered": 100 } @@ -557,13 +557,13 @@ ANALYZE "query_block": { "select_id": 1, "r_loops": 1, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "filesort": { "r_loops": 1, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "r_used_priority_queue": false, "r_output_rows": 256, - "r_buffer_size": "5Kb", + "volatile parameter": "REPLACED", "temporary_table": { "table": { "table_name": "t2", @@ -571,7 +571,7 @@ ANALYZE "r_loops": 1, "rows": 256, "r_rows": 256, - "r_total_time_ms": "REPLACED", + "volatile parameter": "REPLACED", "filtered": 100, "r_filtered": 100 } diff --git a/mysql-test/t/analyze_format_json.test b/mysql-test/t/analyze_format_json.test index 0b55915c047..db626dc387e 100644 --- a/mysql-test/t/analyze_format_json.test +++ b/mysql-test/t/analyze_format_json.test @@ -164,15 +164,15 @@ create table t2 ( ); insert into t2 select A.a*1000 + B.a, A.a*1000 + B.a from t0 A, t1 B; --echo # normal HAVING ---replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/ +--replace_regex /"(r_total_time_ms|r_buffer_size)": .*?,/"volatile parameter": "REPLACED",/ analyze format=json select a, max(b) as TOP from t2 group by a having TOP > a; --echo # HAVING is always TRUE (not printed) ---replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/ +--replace_regex /"(r_total_time_ms|r_buffer_size)": .*?,/"volatile parameter": "REPLACED",/ analyze format=json select a, max(b) as TOP from t2 group by a having 1<>2; --echo # HAVING is always FALSE (intercepted by message) ---replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/ +--replace_regex /"(r_total_time_ms|r_buffer_size)": .*?,/"volatile parameter": "REPLACED",/ analyze format=json select a, max(b) as TOP from t2 group by a having 1=2; --echo # HAVING is absent ---replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/ +--replace_regex /"(r_total_time_ms|r_buffer_size)": .*?,/"volatile parameter": "REPLACED",/ analyze format=json select a, max(b) as TOP from t2 group by a; drop table t0, t1, t2; |