revision-id: b70981f52056baeebd611790c4b1a638dc7e01ec (mariadb-10.6.1-367-gb70981f5205) parent(s): 3ed3cda97dce533c0511ff81389d05f3792946e8 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2022-03-20 14:46:16 +0300 message: Update test results (3) --- mysql-test/main/delete_use_source.result | 12 ++++++------ mysql-test/main/mrr_icp_extra.result | 4 ++-- mysql-test/main/mrr_icp_extra.test | 4 ++-- mysql-test/main/order_by_innodb.result | 6 +++--- mysql-test/main/order_by_innodb.test | 2 +- mysql-test/suite/galera/r/galera_many_indexes.result | 12 ++++++------ .../suite/innodb/r/innodb_bulk_create_index_debug.result | 16 ++++++++-------- mysql-test/suite/innodb_gis/r/point_big.result | 4 ++-- mysql-test/suite/innodb_gis/t/point_big.test | 2 +- mysql-test/suite/s3/basic.result | 4 ++-- mysql-test/suite/s3/basic.test | 1 + 11 files changed, 34 insertions(+), 33 deletions(-) diff --git a/mysql-test/main/delete_use_source.result b/mysql-test/main/delete_use_source.result index 0990a551db6..5ee93cfebd5 100644 --- a/mysql-test/main/delete_use_source.result +++ b/mysql-test/main/delete_use_source.result @@ -48,9 +48,9 @@ rollback; # start transaction; explain delete from v1 where (select count(*) from t1 b where b.c1=v1.c1) = 500 limit 1; -id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t1 range c1 c1 4 NULL 600 Using where -2 DEPENDENT SUBQUERY b ref c1 c1 4 test.t1.c1 167 Using index +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 NULL range c1 c1 4 NULL 600 100.00 Using where +2 DEPENDENT SUBQUERY b NULL ref c1 c1 4 test.t1.c1 167 100.00 Using index delete from v1 where (select count(*) from t1 b where b.c1=v1.c1) = 500 limit 1; affected rows: 1 delete from v1 where (select count(*) from t1 b where b.c1=v1.c1) = 500 limit 1; @@ -64,9 +64,9 @@ rollback; # start transaction; explain delete from v1 where (select count(*) from t1 b where b.c1=v1.c1) = 500; -id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t1 ALL c1 NULL NULL NULL # Using where -2 DEPENDENT SUBQUERY b ref c1 c1 4 test.t1.c1 # Using index +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t1 NULL ALL c1 NULL NULL NULL # 100.00 Using where +2 DEPENDENT SUBQUERY b NULL ref c1 c1 4 test.t1.c1 # 100.00 Using index delete from v1 where (select count(*) from t1 b where b.c1=v1.c1) = 500 ; affected rows: 500 select count(*) from v1 where c1=0; diff --git a/mysql-test/main/mrr_icp_extra.result b/mysql-test/main/mrr_icp_extra.result index bd1f8a80bfe..89d5bf26b37 100644 --- a/mysql-test/main/mrr_icp_extra.result +++ b/mysql-test/main/mrr_icp_extra.result @@ -862,7 +862,7 @@ explain SELECT * FROM City WHERE Name BETWEEN 'G' AND 'K' AND Population > 500000 AND Country LIKE 'C%'; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE City NULL range Population,Country # # NULL # 1.67 Using index condition; Using where; Rowid-ordered scan +1 SIMPLE City NULL range Population,Country # # NULL # # Using index condition; Using where; Rowid-ordered scan SELECT * FROM City WHERE Name BETWEEN 'G' AND 'K' AND Population > 500000 AND Country LIKE 'C%'; ID Name Country Population @@ -882,7 +882,7 @@ explain SELECT * FROM City WHERE Name BETWEEN 'G' AND 'J' AND Population > 500000 AND Country LIKE 'C%'; id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 SIMPLE City NULL range Population,Country # # NULL # 1.33 Using index condition; Using where; Rowid-ordered scan +1 SIMPLE City NULL range Population,Country # # NULL # # Using index condition; Using where; Rowid-ordered scan SELECT * FROM City WHERE Name BETWEEN 'G' AND 'J' AND Population > 500000 AND Country LIKE 'C%'; ID Name Country Population diff --git a/mysql-test/main/mrr_icp_extra.test b/mysql-test/main/mrr_icp_extra.test index 9bb1330ee7c..0b33f87d2b2 100644 --- a/mysql-test/main/mrr_icp_extra.test +++ b/mysql-test/main/mrr_icp_extra.test @@ -225,14 +225,14 @@ explain SELECT * FROM City WHERE Name LIKE 'M%' AND Population > 7000000; ---replace_column 7 # 8 # 10 # +--replace_column 7 # 8 # 10 # 11 # explain SELECT * FROM City WHERE Name BETWEEN 'G' AND 'K' AND Population > 500000 AND Country LIKE 'C%'; SELECT * FROM City WHERE Name BETWEEN 'G' AND 'K' AND Population > 500000 AND Country LIKE 'C%'; ---replace_column 7 # 8 # 10 # +--replace_column 7 # 8 # 10 # 11 # explain SELECT * FROM City WHERE Name BETWEEN 'G' AND 'J' AND Population > 500000 AND Country LIKE 'C%'; diff --git a/mysql-test/main/order_by_innodb.result b/mysql-test/main/order_by_innodb.result index 3f0e9b2135e..aeae44b91a6 100644 --- a/mysql-test/main/order_by_innodb.result +++ b/mysql-test/main/order_by_innodb.result @@ -248,9 +248,9 @@ d1 > '2019-02-06 00:00:00' dd.d1, dd.d2, dd.id limit 1 ); id select_type table partitions type possible_keys key key_len ref rows filtered Extra -1 PRIMARY t1 NULL index NULL PRIMARY 4 NULL # 100.00 Using index -1 PRIMARY t2 NULL eq_ref PRIMARY,id2 PRIMARY 4 func # 100.00 Using where -2 DEPENDENT SUBQUERY dd NULL range id2,for_latest_sort for_latest_sort 6 NULL # 100.00 Using where +1 PRIMARY t1 NULL index NULL PRIMARY 4 NULL # # Using index +1 PRIMARY t2 NULL eq_ref PRIMARY,id2 PRIMARY 4 func # # Using where +2 DEPENDENT SUBQUERY dd NULL range id2,for_latest_sort for_latest_sort 6 NULL # # Using where drop table t1,t2,t3; # End of 10.2 tests # diff --git a/mysql-test/main/order_by_innodb.test b/mysql-test/main/order_by_innodb.test index d6ee16300fb..df4a38aa33c 100644 --- a/mysql-test/main/order_by_innodb.test +++ b/mysql-test/main/order_by_innodb.test @@ -224,7 +224,7 @@ from --echo # This must NOT have "Range checked for each record" without any --echo # provisions to produce rows in the required ordering: ---replace_column 10 # +--replace_column 10 # 11 # explain select t1.id,t2.id diff --git a/mysql-test/suite/galera/r/galera_many_indexes.result b/mysql-test/suite/galera/r/galera_many_indexes.result index 440d128b8fc..bc0e1c86ddb 100644 --- a/mysql-test/suite/galera/r/galera_many_indexes.result +++ b/mysql-test/suite/galera/r/galera_many_indexes.result @@ -73,20 +73,20 @@ SELECT LENGTH(f1) = 767 FROM t1; LENGTH(f1) = 767 1 EXPLAIN SELECT COUNT(*) = 1 FROM t1 FORCE KEY (PRIMARY) WHERE f1 = REPEAT('a', 767); -id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t1 NULL const PRIMARY PRIMARY 769 const 1 Using index +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL const PRIMARY PRIMARY 769 const 1 100.00 Using index SELECT COUNT(*) = 1 FROM t1 FORCE KEY (PRIMARY) WHERE f1 = REPEAT('a', 767); COUNT(*) = 1 1 EXPLAIN SELECT COUNT(*) = 1 FROM t1 FORCE KEY (i1) WHERE f1 = REPEAT('a', 767); -id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t1 NULL const i1 i1 769 const 1 Using index +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL const i1 i1 769 const 1 100.00 Using index SELECT COUNT(*) = 1 FROM t1 FORCE KEY (i1) WHERE f1 = REPEAT('a', 767); COUNT(*) = 1 1 EXPLAIN SELECT COUNT(*) = 1 FROM t1 FORCE KEY (i63) WHERE f1 = REPEAT('a', 767); -id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t1 NULL const i63 i63 769 const 1 Using index +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL const i63 i63 769 const 1 100.00 Using index SELECT COUNT(*) = 1 FROM t1 FORCE KEY (i63) WHERE f1 = REPEAT('a', 767); COUNT(*) = 1 1 diff --git a/mysql-test/suite/innodb/r/innodb_bulk_create_index_debug.result b/mysql-test/suite/innodb/r/innodb_bulk_create_index_debug.result index 830aa858daa..9ff1519e781 100644 --- a/mysql-test/suite/innodb/r/innodb_bulk_create_index_debug.result +++ b/mysql-test/suite/innodb/r/innodb_bulk_create_index_debug.result @@ -84,8 +84,8 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK EXPLAIN SELECT * FROM t1 WHERE title = 'a10'; -id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 Using index condition +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 Using index condition SELECT * FROM t1 WHERE title = 'a10'; class id title 10 10 a10 @@ -217,8 +217,8 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK EXPLAIN SELECT * FROM t1 WHERE title = 'a10'; -id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 Using index condition +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 Using index condition SELECT * FROM t1 WHERE title = 'a10'; class id title 10 10 a10 @@ -350,8 +350,8 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK EXPLAIN SELECT * FROM t1 WHERE title = 'a10'; -id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 Using index condition +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 Using index condition SELECT * FROM t1 WHERE title = 'a10'; class id title 10 10 a10 @@ -486,8 +486,8 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK EXPLAIN SELECT * FROM t1 WHERE title = 'a10'; -id select_type table partitions type possible_keys key key_len ref rows Extra -1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 Using index condition +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL ref idx_title idx_title 103 const 1 100.00 Using index condition SELECT * FROM t1 WHERE title = 'a10'; class id title 10 10 a10 diff --git a/mysql-test/suite/innodb_gis/r/point_big.result b/mysql-test/suite/innodb_gis/r/point_big.result index 7248c55bafe..28b93678d9c 100644 --- a/mysql-test/suite/innodb_gis/r/point_big.result +++ b/mysql-test/suite/innodb_gis/r/point_big.result @@ -259,8 +259,8 @@ INSERT INTO gis_point VALUES (ST_PointFromText('POINT(32.1234 64.2468)'), ST_PointFromText('POINT(-1 -1)')); 'The ORDER BY for spatial index will use filesort' EXPLAIN SELECT ST_AsText(p1), ST_AsText(p2) FROM gis_point ORDER BY p1, p2; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE gis_point ALL NULL NULL NULL NULL # Using filesort +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE gis_point NULL ALL NULL NULL NULL NULL # 100.00 Using filesort SELECT ST_AsText(p1), ST_AsText(p2) FROM gis_point ORDER BY p1, p2; ST_AsText(p1) ST_AsText(p2) POINT(2 4) POINT(-2 -6) diff --git a/mysql-test/suite/innodb_gis/t/point_big.test b/mysql-test/suite/innodb_gis/t/point_big.test index d46fc5d9139..d9a00474d89 100644 --- a/mysql-test/suite/innodb_gis/t/point_big.test +++ b/mysql-test/suite/innodb_gis/t/point_big.test @@ -145,7 +145,7 @@ INSERT INTO gis_point VALUES (ST_PointFromText('POINT(32.1234 64.2468)'), ST_PointFromText('POINT(-1 -1)')); -- echo 'The ORDER BY for spatial index will use filesort' ---replace_column 9 # +--replace_column 10 # EXPLAIN SELECT ST_AsText(p1), ST_AsText(p2) FROM gis_point ORDER BY p1, p2; SELECT ST_AsText(p1), ST_AsText(p2) FROM gis_point ORDER BY p1, p2; diff --git a/mysql-test/suite/s3/basic.result b/mysql-test/suite/s3/basic.result index ac391ba3574..cef11176558 100644 --- a/mysql-test/suite/s3/basic.result +++ b/mysql-test/suite/s3/basic.result @@ -49,8 +49,8 @@ a b 19 29 20 30 explain select * from t1 where a between 10 and 20; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range a a 5 NULL # Using index condition +id select_type table partitions type possible_keys key key_len ref rows filtered Extra +1 SIMPLE t1 NULL range a a 5 NULL # 100.00 Using index condition insert into t1 values (1,1); ERROR HY000: Table 't1' is read only update t1 set b=100 where a=1; diff --git a/mysql-test/suite/s3/basic.test b/mysql-test/suite/s3/basic.test index 9f73f6da378..4b5a2f755a6 100644 --- a/mysql-test/suite/s3/basic.test +++ b/mysql-test/suite/s3/basic.test @@ -18,6 +18,7 @@ insert into t1 select seq, seq+10, repeat(char(65+ mod(seq, 20)),mod(seq,1000)) alter table t1 engine=s3; show create table t1; +---replace_column 2 # 11 # 15 # 16 # 17 # 23 # --replace_result $database database --eval select * from information_schema.tables where table_schema="$database" and table_name="t1"; --replace_column 8 # 12 # 13 # 14 # 19 #