fix for 32bit system. Not meaninful for this test but volatile parameters replaced.

Author: sanja-byelkin

mysql-test/r/analyze_format_json.result

@@ -487,22 +487,22 @@ 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",
  "access_type": "ALL",
  "r_loops": 1,
  "rows": 256,
  "r_rows": 256,
- "r_total_time_ms": "REPLACED",
+ "volatile parameter": "REPLACED",
  "filtered": 100,
  "r_filtered": 100
  }
@@ -517,21 +517,21 @@ 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",
  "access_type": "ALL",
  "r_loops": 1,
  "rows": 256,
  "r_rows": 256,
- "r_total_time_ms": "REPLACED",
+ "volatile parameter": "REPLACED",
  "filtered": 100,
  "r_filtered": 100
  }
@@ -557,21 +557,21 @@ 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",
  "access_type": "ALL",
  "r_loops": 1,
  "rows": 256,
  "r_rows": 256,
- "r_total_time_ms": "REPLACED",
+ "volatile parameter": "REPLACED",
  "filtered": 100,
  "r_filtered": 100
  }

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;