Skip to content

Commit 139ce6c

Browse files
committed
fix for 32bit system. Not meaninful for this test but volatile parameters replaced.
1 parent c8db0df commit 139ce6c

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

mysql-test/r/analyze_format_json.result

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -487,22 +487,22 @@ ANALYZE
487487
"query_block": {
488488
"select_id": 1,
489489
"r_loops": 1,
490-
"r_total_time_ms": "REPLACED",
490+
"volatile parameter": "REPLACED",
491491
"having_condition": "(TOP > a)",
492492
"filesort": {
493493
"r_loops": 1,
494-
"r_total_time_ms": "REPLACED",
494+
"volatile parameter": "REPLACED",
495495
"r_used_priority_queue": false,
496496
"r_output_rows": 0,
497-
"r_buffer_size": "5Kb",
497+
"volatile parameter": "REPLACED",
498498
"temporary_table": {
499499
"table": {
500500
"table_name": "t2",
501501
"access_type": "ALL",
502502
"r_loops": 1,
503503
"rows": 256,
504504
"r_rows": 256,
505-
"r_total_time_ms": "REPLACED",
505+
"volatile parameter": "REPLACED",
506506
"filtered": 100,
507507
"r_filtered": 100
508508
}
@@ -517,21 +517,21 @@ ANALYZE
517517
"query_block": {
518518
"select_id": 1,
519519
"r_loops": 1,
520-
"r_total_time_ms": "REPLACED",
520+
"volatile parameter": "REPLACED",
521521
"filesort": {
522522
"r_loops": 1,
523-
"r_total_time_ms": "REPLACED",
523+
"volatile parameter": "REPLACED",
524524
"r_used_priority_queue": false,
525525
"r_output_rows": 256,
526-
"r_buffer_size": "5Kb",
526+
"volatile parameter": "REPLACED",
527527
"temporary_table": {
528528
"table": {
529529
"table_name": "t2",
530530
"access_type": "ALL",
531531
"r_loops": 1,
532532
"rows": 256,
533533
"r_rows": 256,
534-
"r_total_time_ms": "REPLACED",
534+
"volatile parameter": "REPLACED",
535535
"filtered": 100,
536536
"r_filtered": 100
537537
}
@@ -557,21 +557,21 @@ ANALYZE
557557
"query_block": {
558558
"select_id": 1,
559559
"r_loops": 1,
560-
"r_total_time_ms": "REPLACED",
560+
"volatile parameter": "REPLACED",
561561
"filesort": {
562562
"r_loops": 1,
563-
"r_total_time_ms": "REPLACED",
563+
"volatile parameter": "REPLACED",
564564
"r_used_priority_queue": false,
565565
"r_output_rows": 256,
566-
"r_buffer_size": "5Kb",
566+
"volatile parameter": "REPLACED",
567567
"temporary_table": {
568568
"table": {
569569
"table_name": "t2",
570570
"access_type": "ALL",
571571
"r_loops": 1,
572572
"rows": 256,
573573
"r_rows": 256,
574-
"r_total_time_ms": "REPLACED",
574+
"volatile parameter": "REPLACED",
575575
"filtered": 100,
576576
"r_filtered": 100
577577
}

mysql-test/t/analyze_format_json.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ create table t2 (
164164
);
165165
insert into t2 select A.a*1000 + B.a, A.a*1000 + B.a from t0 A, t1 B;
166166
--echo # normal HAVING
167-
--replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/
167+
--replace_regex /"(r_total_time_ms|r_buffer_size)": .*?,/"volatile parameter": "REPLACED",/
168168
analyze format=json select a, max(b) as TOP from t2 group by a having TOP > a;
169169
--echo # HAVING is always TRUE (not printed)
170-
--replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/
170+
--replace_regex /"(r_total_time_ms|r_buffer_size)": .*?,/"volatile parameter": "REPLACED",/
171171
analyze format=json select a, max(b) as TOP from t2 group by a having 1<>2;
172172
--echo # HAVING is always FALSE (intercepted by message)
173-
--replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/
173+
--replace_regex /"(r_total_time_ms|r_buffer_size)": .*?,/"volatile parameter": "REPLACED",/
174174
analyze format=json select a, max(b) as TOP from t2 group by a having 1=2;
175175
--echo # HAVING is absent
176-
--replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/
176+
--replace_regex /"(r_total_time_ms|r_buffer_size)": .*?,/"volatile parameter": "REPLACED",/
177177
analyze format=json select a, max(b) as TOP from t2 group by a;
178178
drop table t0, t1, t2;

0 commit comments

Comments
 (0)