database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

cleanup: make a couple of tests more robust

Browse Source 
with --sorted_result
This commit is contained in:
Sergei Golubchik
2017-02-05 13:00:12 +01:00
parent cff144a8ea
commit 01dd355635
11 changed files with 226 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/row.result
View File

@ -354,12 +354,12 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref PRIMARY PRIMARY 4 test.t1.a 1 Using index 1 SIMPLE t2 ref PRIMARY PRIMARY 4 test.t1.a 1 Using index
SELECT * FROM t1,t2 WHERE t1.a=1 and t1.b=t2.b; SELECT * FROM t1,t2 WHERE t1.a=1 and t1.b=t2.b;
a b a b c a b a b c
1 1 1 1 2
1 1 3 1 3
1 2 1 2 2
1 1 1 1 1 1 1 1 1 1
1 1 1 1 2
1 1 3 1 1 1 1 3 1 1
1 1 3 1 3
1 2 1 2 1 1 2 1 2 1
1 2 1 2 2
SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,2); SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,2);
a b a b c a b a b c
1 2 1 1 1 1 2 1 1 1
@ -388,10 +388,10 @@ Warnings:
Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t1` join `test`.`t2` where `test`.`t1`.`a` - 1 = `test`.`t2`.`a` - 1 and `test`.`t1`.`b` = `test`.`t2`.`b` + 1 Note 1003 select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t1` join `test`.`t2` where `test`.`t1`.`a` - 1 = `test`.`t2`.`a` - 1 and `test`.`t1`.`b` = `test`.`t2`.`b` + 1
SELECT * FROM t1,t2 WHERE (t1.a-1,t1.b)=(t2.a-1,t2.b+1); SELECT * FROM t1,t2 WHERE (t1.a-1,t1.b)=(t2.a-1,t2.b+1);
a b a b c a b a b c
1 2 1 1 2
3 2 3 1 3
1 2 1 1 1 1 2 1 1 1
1 2 1 1 2
3 2 3 1 1 3 2 3 1 1
3 2 3 1 3
EXPLAIN SELECT * FROM t2 WHERE a=3 AND b=2; EXPLAIN SELECT * FROM t2 WHERE a=3 AND b=2;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref PRIMARY PRIMARY 8 const,const 1 Using index 1 SIMPLE t2 ref PRIMARY PRIMARY 8 const,const 1 Using index

68
mysql-test/r/subselect.result
View File

@ -6012,26 +6012,26 @@ SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2
WHERE EXISTS (SELECT DISTINCT f1_key FROM t2 WHERE EXISTS (SELECT DISTINCT f1_key FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1);
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
DROP TABLE t1,t2; DROP TABLE t1,t2;
# #
# LP bug 919427: EXPLAIN for a query over a single-row table # LP bug 919427: EXPLAIN for a query over a single-row table
@ -6362,26 +6362,26 @@ SELECT DISTINCT f1_key
FROM t2 FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 ); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 );
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
explain SELECT table1.f1, table2.f1_key explain SELECT table1.f1, table2.f1_key
FROM t1 AS table1, t2 AS table2 FROM t1 AS table1, t2 AS table2
WHERE EXISTS WHERE EXISTS

68
mysql-test/r/subselect_no_exists_to_in.result
View File

@ -6012,26 +6012,26 @@ SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2
WHERE EXISTS (SELECT DISTINCT f1_key FROM t2 WHERE EXISTS (SELECT DISTINCT f1_key FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1);
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
DROP TABLE t1,t2; DROP TABLE t1,t2;
# #
# LP bug 919427: EXPLAIN for a query over a single-row table # LP bug 919427: EXPLAIN for a query over a single-row table
@ -6362,26 +6362,26 @@ SELECT DISTINCT f1_key
FROM t2 FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 ); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 );
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
explain SELECT table1.f1, table2.f1_key explain SELECT table1.f1, table2.f1_key
FROM t1 AS table1, t2 AS table2 FROM t1 AS table1, t2 AS table2
WHERE EXISTS WHERE EXISTS

68
mysql-test/r/subselect_no_mat.result
View File

@ -6009,26 +6009,26 @@ SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2
WHERE EXISTS (SELECT DISTINCT f1_key FROM t2 WHERE EXISTS (SELECT DISTINCT f1_key FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1);
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
DROP TABLE t1,t2; DROP TABLE t1,t2;
# #
# LP bug 919427: EXPLAIN for a query over a single-row table # LP bug 919427: EXPLAIN for a query over a single-row table
@ -6357,26 +6357,26 @@ SELECT DISTINCT f1_key
FROM t2 FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 ); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 );
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
explain SELECT table1.f1, table2.f1_key explain SELECT table1.f1, table2.f1_key
FROM t1 AS table1, t2 AS table2 FROM t1 AS table1, t2 AS table2
WHERE EXISTS WHERE EXISTS

68
mysql-test/r/subselect_no_opts.result
View File

@ -6005,26 +6005,26 @@ SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2
WHERE EXISTS (SELECT DISTINCT f1_key FROM t2 WHERE EXISTS (SELECT DISTINCT f1_key FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1);
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
DROP TABLE t1,t2; DROP TABLE t1,t2;
# #
# LP bug 919427: EXPLAIN for a query over a single-row table # LP bug 919427: EXPLAIN for a query over a single-row table
@ -6353,26 +6353,26 @@ SELECT DISTINCT f1_key
FROM t2 FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 ); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 );
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
explain SELECT table1.f1, table2.f1_key explain SELECT table1.f1, table2.f1_key
FROM t1 AS table1, t2 AS table2 FROM t1 AS table1, t2 AS table2
WHERE EXISTS WHERE EXISTS

68
mysql-test/r/subselect_no_scache.result
View File

@ -6018,26 +6018,26 @@ SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2
WHERE EXISTS (SELECT DISTINCT f1_key FROM t2 WHERE EXISTS (SELECT DISTINCT f1_key FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1);
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
DROP TABLE t1,t2; DROP TABLE t1,t2;
# #
# LP bug 919427: EXPLAIN for a query over a single-row table # LP bug 919427: EXPLAIN for a query over a single-row table
@ -6368,26 +6368,26 @@ SELECT DISTINCT f1_key
FROM t2 FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 ); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 );
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
explain SELECT table1.f1, table2.f1_key explain SELECT table1.f1, table2.f1_key
FROM t1 AS table1, t2 AS table2 FROM t1 AS table1, t2 AS table2
WHERE EXISTS WHERE EXISTS

68
mysql-test/r/subselect_no_semijoin.result
View File

@ -6005,26 +6005,26 @@ SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2
WHERE EXISTS (SELECT DISTINCT f1_key FROM t2 WHERE EXISTS (SELECT DISTINCT f1_key FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1);
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
DROP TABLE t1,t2; DROP TABLE t1,t2;
# #
# LP bug 919427: EXPLAIN for a query over a single-row table # LP bug 919427: EXPLAIN for a query over a single-row table
@ -6353,26 +6353,26 @@ SELECT DISTINCT f1_key
FROM t2 FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 ); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 );
f1 f1_key f1 f1_key
v j
s j
v v
s v
v c
s c s c
v m s d
s d
s d
s j
s m s m
v d
s d
v d
s d
v y
s y
v t
s t
v d
s d
v s
s s s s
s t
s v
s y
v c
v d
v d
v d
v j
v m
v s
v t
v v
v y
explain SELECT table1.f1, table2.f1_key explain SELECT table1.f1, table2.f1_key
FROM t1 AS table1, t2 AS table2 FROM t1 AS table1, t2 AS table2
WHERE EXISTS WHERE EXISTS

24
mysql-test/r/view.result
View File

@ -1579,22 +1579,22 @@ execute stmt1 using @a;
deallocate prepare stmt1; deallocate prepare stmt1;
select * from v3; select * from v3;
a b a b
100 1000
101 1000
300 1000
301 1000
100 10
101 10
300 10
301 10
100 2000
101 2000
300 2000
301 2000
100 0 100 0
100 10
100 1000
100 2000
101 0 101 0
101 10
101 1000
101 2000
300 0 300 0
300 10
300 1000
300 2000
301 0 301 0
301 10
301 1000
301 2000
drop view v3; drop view v3;
drop tables t1,t2; drop tables t1,t2;
create table t1(f1 int); create table t1(f1 int);

2
mysql-test/t/row.test
View File

@ -187,6 +187,7 @@ SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,t2.b);
EXPLAIN SELECT * FROM t1,t2 WHERE t1.a=t2.a AND t1.b=2; EXPLAIN SELECT * FROM t1,t2 WHERE t1.a=t2.a AND t1.b=2;
EXPLAIN SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,2); EXPLAIN SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,2);
--sorted_result
SELECT * FROM t1,t2 WHERE t1.a=1 and t1.b=t2.b; SELECT * FROM t1,t2 WHERE t1.a=1 and t1.b=t2.b;
SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,2); SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,2);
@ -194,6 +195,7 @@ EXPLAIN EXTENDED SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,t2.b+1);
SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,t2.b+1); SELECT * FROM t1,t2 WHERE (t1.a,t1.b)=(t2.a,t2.b+1);
EXPLAIN EXTENDED SELECT * FROM t1,t2 WHERE (t1.a-1,t1.b)=(t2.a-1,t2.b+1); EXPLAIN EXTENDED SELECT * FROM t1,t2 WHERE (t1.a-1,t1.b)=(t2.a-1,t2.b+1);
--sorted_result
SELECT * FROM t1,t2 WHERE (t1.a-1,t1.b)=(t2.a-1,t2.b+1); SELECT * FROM t1,t2 WHERE (t1.a-1,t1.b)=(t2.a-1,t2.b+1);
EXPLAIN SELECT * FROM t2 WHERE a=3 AND b=2; EXPLAIN SELECT * FROM t2 WHERE a=3 AND b=2;

2
mysql-test/t/subselect.test
View File

@ -5031,6 +5031,7 @@ EXPLAIN
SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2 SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2
WHERE EXISTS (SELECT DISTINCT f1_key FROM t2 WHERE EXISTS (SELECT DISTINCT f1_key FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1);
--sorted_result
SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2 SELECT table1.f1, table2.f1_key FROM t1 AS table1, t2 AS table2
WHERE EXISTS (SELECT DISTINCT f1_key FROM t2 WHERE EXISTS (SELECT DISTINCT f1_key FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1);
@ -5330,6 +5331,7 @@ SELECT DISTINCT f1_key
FROM t2 FROM t2
WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 ); WHERE f1_key != table2.f1_key AND f1_key >= table1.f1 );
--sorted_result
eval $query; eval $query;
eval explain $query; eval explain $query;

1
mysql-test/t/view.test
View File

@ -1407,6 +1407,7 @@ execute stmt1 using @a;
set @a= 301; set @a= 301;
execute stmt1 using @a; execute stmt1 using @a;
deallocate prepare stmt1; deallocate prepare stmt1;
--sorted_result
select * from v3; select * from v3;
drop view v3; drop view v3;