Skip to content

Commit

Permalink
MDEV-7916: main.analyze_format_json fails in buildbot on labrador
Browse files Browse the repository at this point in the history
Make the test work on case insensitive FS
  • Loading branch information
spetrunia committed Apr 6, 2015
1 parent eb83e94 commit 7d9e94e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions mysql-test/r/analyze_format_json.result
Expand Up @@ -412,7 +412,7 @@ create table t0 (a int);
INSERT INTO t0 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t1 (a int);
INSERT INTO t1 select * from t0;
analyze format=json (select * from t1 A where a<5) union (select * from t1 B where a in (2,3));
analyze format=json (select * from t1 tbl1 where a<5) union (select * from t1 tbl2 where a in (2,3));
ANALYZE
{
"query_block": {
Expand All @@ -428,15 +428,15 @@ ANALYZE
"r_loops": 1,
"r_total_time_ms": "REPLACED",
"table": {
"table_name": "A",
"table_name": "tbl1",
"access_type": "ALL",
"r_loops": 1,
"rows": 10,
"r_rows": 10,
"r_total_time_ms": "REPLACED",
"filtered": 100,
"r_filtered": 50,
"attached_condition": "(A.a < 5)"
"attached_condition": "(tbl1.a < 5)"
}
}
},
Expand All @@ -446,15 +446,15 @@ ANALYZE
"r_loops": 1,
"r_total_time_ms": "REPLACED",
"table": {
"table_name": "B",
"table_name": "tbl2",
"access_type": "ALL",
"r_loops": 1,
"rows": 10,
"r_rows": 10,
"r_total_time_ms": "REPLACED",
"filtered": 100,
"r_filtered": 20,
"attached_condition": "(B.a in (2,3))"
"attached_condition": "(tbl2.a in (2,3))"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/t/analyze_format_json.test
Expand Up @@ -145,7 +145,7 @@ create table t1 (a int);
INSERT INTO t1 select * from t0;

--replace_regex /"r_total_time_ms": [0-9]*[.]?[0-9]*/"r_total_time_ms": "REPLACED"/
analyze format=json (select * from t1 A where a<5) union (select * from t1 B where a in (2,3));
analyze format=json (select * from t1 tbl1 where a<5) union (select * from t1 tbl2 where a in (2,3));

drop table t0, t1;

Expand Down

0 comments on commit 7d9e94e

Please sign in to comment.