Skip to content

Commit b522413

Browse files
author
Steinar H. Gunderson
committed
Bug #31397578: MAKE TESTS RESILIENT TO ORDER CHANGES [noclose]
Yet more test changes to prepare for the hypergraph optimizer. Change-Id: I0c87f8d7e295e83789e325ea98fb417e7bd354a5
1 parent 6728be5 commit b522413

File tree

68 files changed

+219
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+219
-94
lines changed

‎mysql-test/include/func_in.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ DROP TABLE t1,t2,t3,t4;
383383
CREATE TABLE t1 (id int not null);
384384
INSERT INTO t1 VALUES (1),(2);
385385

386+
--skip_if_hypergraph # Different warnings.
386387
SELECT id FROM t1 WHERE id IN(4564, (SELECT IF(1=0,1,1/0)) );
387388

388389
DROP TABLE t1;
@@ -414,10 +415,12 @@ select f1 from t1 where f1 in (2,1);
414415
explain select f1 from t1 where f1 in (2,1);
415416
create table t2(f2 int, index t2f2(f2));
416417
insert into t2 values(0),(1),(2);
418+
--skip_if_hypergraph # Different warnings.
417419
select f2 from t2 where f2 in ('a',2);
418420
explain select f2 from t2 where f2 in ('a',2);
419421
select f2 from t2 where f2 in ('a','b');
420422
explain select f2 from t2 where f2 in ('a','b');
423+
--skip_if_hypergraph # Different warnings.
421424
select f2 from t2 where f2 in (1,'b');
422425
explain select f2 from t2 where f2 in (1,'b');
423426
drop table t1, t2;

‎mysql-test/include/subquery_mat.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,7 @@ ALTER TABLE t1 ADD INDEX(a);
498498
--let $query=SELECT * FROM t1 WHERE (a,b) = ANY (SELECT a, max(b) FROM t1 GROUP BY a)
499499
FLUSH STATUS;
500500
--eval $query
501+
--skip_if_hypergraph # Depends on the query plan.
501502
SHOW SESSION STATUS LIKE 'Sort_scan%';
502503
--eval EXPLAIN $query
503504

@@ -1164,6 +1165,7 @@ having (z in (select * from t2)) is null;
11641165
--echo no NULLs.
11651166

11661167
eval explain $query;
1168+
--sorted_result
11671169
eval $query;
11681170

11691171
--echo one outer NULL

‎mysql-test/include/subquery_sj.inc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,13 +493,15 @@ where c.a in (select a from t1 d);
493493
flush status;
494494
select count(*) from t0 a, t0 b, t0 c
495495
where c.a in (select a from t1 d);
496+
--skip_if_hypergraph # Depends on the query plan.
496497
show status like 'Created_tmp_disk_tables';
497498

498499
set @@max_heap_table_size= @save_max_heap_table_size;
499500
set session internal_tmp_mem_storage_engine=default;
500501
flush status;
501502
select count(*) from t0 a, t0 b, t0 c
502503
where c.a in (select a from t1 d);
504+
--skip_if_hypergraph # Depends on the query plan.
503505
show status like 'Created_tmp_disk_tables';
504506

505507
drop table t0, t1;
@@ -932,6 +934,7 @@ explain select left(a1,7), left(a2,7)
932934
from t1_512
933935
where a1 in (select group_concat(b1) from t2_512 group by b2);
934936

937+
--skip_if_hypergraph # Differing warnings.
935938
select left(a1,7), left(a2,7)
936939
from t1_512
937940
where a1 in (select group_concat(b1) from t2_512 group by b2);
@@ -942,6 +945,7 @@ explain select left(a1,7), left(a2,7)
942945
from t1_512
943946
where a1 in (select group_concat(b1) from t2_512 group by b2);
944947

948+
--skip_if_hypergraph # Differing warnings.
945949
select left(a1,7), left(a2,7)
946950
from t1_512
947951
where a1 in (select group_concat(b1) from t2_512 group by b2);
@@ -1014,6 +1018,7 @@ explain select left(a1,7), left(a2,7)
10141018
from t1_513
10151019
where a1 in (select group_concat(b1) from t2_513 group by b2);
10161020

1021+
--skip_if_hypergraph # Differing warnings.
10171022
select left(a1,7), left(a2,7)
10181023
from t1_513
10191024
where a1 in (select group_concat(b1) from t2_513 group by b2);
@@ -1086,6 +1091,7 @@ explain select left(a1,7), left(a2,7)
10861091
from t1_1024
10871092
where a1 in (select group_concat(b1) from t2_1024 group by b2);
10881093

1094+
--skip_if_hypergraph # Differing warnings.
10891095
select left(a1,7), left(a2,7)
10901096
from t1_1024
10911097
where a1 in (select group_concat(b1) from t2_1024 group by b2);
@@ -1096,6 +1102,7 @@ explain select left(a1,7), left(a2,7)
10961102
from t1_1024
10971103
where a1 in (select group_concat(b1) from t2_1024 group by b2);
10981104

1105+
--skip_if_hypergraph # Differing warnings.
10991106
select left(a1,7), left(a2,7)
11001107
from t1_1024
11011108
where a1 in (select group_concat(b1) from t2_1024 group by b2);
@@ -1168,6 +1175,7 @@ explain select left(a1,7), left(a2,7)
11681175
from t1_1025
11691176
where a1 in (select group_concat(b1) from t2_1025 group by b2);
11701177

1178+
--skip_if_hypergraph # Differing warnings.
11711179
select left(a1,7), left(a2,7)
11721180
from t1_1025
11731181
where a1 in (select group_concat(b1) from t2_1025 group by b2);
@@ -1178,6 +1186,7 @@ explain select left(a1,7), left(a2,7)
11781186
from t1_1025
11791187
where a1 in (select group_concat(b1) from t2_1025 group by b2);
11801188

1189+
--skip_if_hypergraph # Differing warnings.
11811190
select left(a1,7), left(a2,7)
11821191
from t1_1025
11831192
where a1 in (select group_concat(b1) from t2_1025 group by b2);
@@ -2741,6 +2750,8 @@ WHERE EMPNUM IN
27412750
WHERE PTYPE = 'Design'))";
27422751
EXECUTE stmt;
27432752
--echo
2753+
--echo This line is only in place to help --skip_if_hypergraph diffing some more.
2754+
--echo
27442755
EXECUTE stmt;
27452756
DEALLOCATE PREPARE stmt;
27462757

‎mysql-test/r/count_distinct.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ isbn city libname a
3434
007 Berkeley Berkeley Public2 1
3535
select t2.isbn,city,t1.libname,count(distinct t1.libname) as a from t3 left join t1 on t3.libname=t1.libname left join t2 on t3.isbn=t2.isbn group by city having count(distinct t1.libname) > 1;
3636
isbn city libname a
37-
007 Berkeley Berkeley Public1 2
3837
000 New York New York Public Libra 2
38+
007 Berkeley Berkeley Public1 2
3939
select t2.isbn,city,t1.libname,count(distinct t1.libname) as a from t3 left join t1 on t3.libname=t1.libname left join t2 on t3.isbn=t2.isbn group by city having count(distinct concat(t1.libname,'a')) > 1;
4040
isbn city libname a
41-
007 Berkeley Berkeley Public1 2
4241
000 New York New York Public Libra 2
42+
007 Berkeley Berkeley Public1 2
4343
select t2.isbn,city,@bar:=t1.libname,count(distinct t1.libname) as a
4444
from t3 left join t1 on t3.libname=t1.libname left join t2
4545
on t3.isbn=t2.isbn group by city having count(distinct

‎mysql-test/r/ctype_gb18030.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,11 +1733,11 @@ INSERT INTO t1 VALUES (_gb18030 0x8BF5819AEDC3), (_gb18030 0x99CC), (_gb18030 0x
17331733
SELECT ANY_VALUE(HEX(c)), COUNT(c) FROM t1 GROUP BY c COLLATE gb18030_chinese_ci;
17341734
ANY_VALUE(HEX(c)) COUNT(c)
17351735
8BF5819AEDC3 1
1736-
99CC 1
17371736
90459958 2
1737+
9068 1
1738+
99CC 1
17381739
AA95C0E59E509AED 1
17391740
CCE7 1
1740-
9068 1
17411741
DROP TABLE t1;
17421742
CREATE TABLE t1 (a int) ENGINE=InnoDB;
17431743
LOAD DATA INFILE '../../std_data/bug21542698.dat' INTO TABLE t1 CHARACTER SET gb18030;

‎mysql-test/r/ctype_gb18030_encoding_utf8.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -557,34 +557,34 @@ INSERT INTO `表一` VALUES ('䑃'), ('一䑃二三四'), ('𠀂𨡃');
557557
SELECT c1, LENGTH(c1) FROM `表一`;
558558
c1 LENGTH(c1)
559559
12345678900987654321 20
560-
一二三四五伍肆叁贰壹 30
560+
䑃 3
561561
一䑃二三四 15
562+
一二三四五伍肆叁贰壹 30
562563
九十 6
563564
六七八 9
564565
百 3
565-
䑃 3
566566
𠀂𨡃 8
567567
𠻜𠻝𠻞𠻟 16
568568
SELECT c1, LPAD(c1, 20, '中') FROM `表一`;
569569
c1 LPAD(c1, 20, '中')
570570
12345678900987654321 12345678900987654321
571-
一二三四五伍肆叁贰壹 中中中中中中中中中中一二三四五伍肆叁贰壹
571+
䑃 中中中中中中中中中中中中中中中中中中中䑃
572572
一䑃二三四 中中中中中中中中中中中中中中中一䑃二三四
573+
一二三四五伍肆叁贰壹 中中中中中中中中中中一二三四五伍肆叁贰壹
573574
九十 中中中中中中中中中中中中中中中中中中九十
574575
六七八 中中中中中中中中中中中中中中中中中六七八
575576
百 中中中中中中中中中中中中中中中中中中中百
576-
䑃 中中中中中中中中中中中中中中中中中中中䑃
577577
𠀂𨡃 中中中中中中中中中中中中中中中中中中𠀂𨡃
578578
𠻜𠻝𠻞𠻟 中中中中中中中中中中中中中中中中𠻜𠻝𠻞𠻟
579579
SELECT c1, RPAD(c1, 20, '𤈼') FROM `表一`;
580580
c1 RPAD(c1, 20, '?')
581581
12345678900987654321 12345678900987654321
582-
一二三四五伍肆叁贰壹 一二三四五伍肆叁贰壹𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
582+
䑃 䑃𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
583583
一䑃二三四 一䑃二三四𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
584+
一二三四五伍肆叁贰壹 一二三四五伍肆叁贰壹𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
584585
九十 九十𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
585586
六七八 六七八𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
586587
百 百𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
587-
䑃 䑃𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
588588
𠀂𨡃 𠀂𨡃𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
589589
𠻜𠻝𠻞𠻟 𠻜𠻝𠻞𠻟𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼𤈼
590590
TRUNCATE `表一`;

‎mysql-test/r/ctype_unicode900.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -891,11 +891,11 @@ CREATE TABLE t1 (c VARCHAR(10) CHARACTER SET utf8mb4);
891891
INSERT INTO t1 VALUES (_utf8mb4 0xF09090A7), (_utf8mb4 0xEA8B93), (_utf8mb4 0xC4BC), (_utf8mb4 0xC6AD), (_utf8mb4 0xF090918F), (_utf8mb4 0xEAAD8B);
892892
SELECT HEX(ANY_VALUE(c)), COUNT(c) FROM t1 GROUP BY c COLLATE utf8mb4_0900_ai_ci;
893893
HEX(ANY_VALUE(c)) COUNT(c)
894-
F09090A7 2
895-
EA8B93 1
896894
C4BC 1
897895
C6AD 1
896+
EA8B93 1
898897
EAAD8B 1
898+
F09090A7 2
899899
DROP TABLE t1;
900900
CREATE TABLE t1 (a VARCHAR(10), b VARCHAR(10)) COLLATE utf8mb4_0900_ai_ci;
901901
INSERT INTO t1 VALUES(_utf16 0xAC00, _utf16 0x326E), (_utf16 0xAD, _utf16 0xA0),

‎mysql-test/r/ctype_unicode900_as_ci.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,11 +780,11 @@ CREATE TABLE t1 (c VARCHAR(10) CHARACTER SET utf8mb4);
780780
INSERT INTO t1 VALUES (_utf8mb4 0xF09090A7), (_utf8mb4 0xEA8B93), (_utf8mb4 0xC4BC), (_utf8mb4 0xC6AD), (_utf8mb4 0xF090918F), (_utf8mb4 0xEAAD8B);
781781
SELECT HEX(ANY_VALUE(c)), COUNT(c) FROM t1 GROUP BY c COLLATE utf8mb4_0900_as_ci;
782782
HEX(ANY_VALUE(c)) COUNT(c)
783-
F09090A7 2
784-
EA8B93 1
785783
C4BC 1
786784
C6AD 1
785+
EA8B93 1
787786
EAAD8B 1
787+
F09090A7 2
788788
DROP TABLE t1;
789789
SET NAMES utf8mb4;
790790
CREATE TABLE t1 (c1 CHAR(10) COLLATE utf8mb4_0900_as_ci);

‎mysql-test/r/ctype_unicode900_as_cs.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -910,12 +910,12 @@ CREATE TABLE t1 (c VARCHAR(10) CHARACTER SET utf8mb4);
910910
INSERT INTO t1 VALUES (_utf8mb4 0xF09090A7), (_utf8mb4 0xEA8B93), (_utf8mb4 0xC4BC), (_utf8mb4 0xC6AD), (_utf8mb4 0xF090918F), (_utf8mb4 0xEAAD8B);
911911
SELECT HEX(ANY_VALUE(c)), COUNT(c) FROM t1 GROUP BY c COLLATE utf8mb4_0900_as_cs;
912912
HEX(ANY_VALUE(c)) COUNT(c)
913-
F09090A7 1
914-
EA8B93 1
915913
C4BC 1
916914
C6AD 1
917-
F090918F 1
915+
EA8B93 1
918916
EAAD8B 1
917+
F09090A7 1
918+
F090918F 1
919919
DROP TABLE t1;
920920
CREATE TABLE t1 (a VARCHAR(10), b VARCHAR(10)) COLLATE utf8mb4_0900_as_cs;
921921
INSERT INTO t1 VALUES(_utf16 0xAC00, _utf16 0x326E), (_utf16 0xAD, _utf16 0xA0),

‎mysql-test/r/gis-rt-precise.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ Note 1003 /* select#1 */ select `test`.`t1`.`fid` AS `fid`,st_astext(`test`.`t1`
2323
SELECT fid, ST_AsText(g) FROM t1 WHERE ST_Within(g, ST_GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))'));
2424
fid ST_AsText(g)
2525
1 LINESTRING(150 150,150 150)
26+
10 LINESTRING(141 141,159 159)
27+
11 LINESTRING(140 140,160 160)
28+
2 LINESTRING(149 149,151 151)
2629
3 LINESTRING(148 148,152 152)
2730
4 LINESTRING(147 147,153 153)
2831
5 LINESTRING(146 146,154 154)
2932
6 LINESTRING(145 145,155 155)
3033
7 LINESTRING(144 144,156 156)
3134
8 LINESTRING(143 143,157 157)
3235
9 LINESTRING(142 142,158 158)
33-
10 LINESTRING(141 141,159 159)
34-
11 LINESTRING(140 140,160 160)
35-
2 LINESTRING(149 149,151 151)
3636
DROP TABLE t1;
3737
CREATE TABLE t1 (
3838
fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,

‎mysql-test/r/group_min_max.result

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2761,6 +2761,11 @@ select * from t1;
27612761
a b
27622762
0 0
27632763
0 1
2764+
0 10
2765+
0 11
2766+
0 12
2767+
0 13
2768+
0 14
27642769
0 2
27652770
0 3
27662771
0 4
@@ -2769,13 +2774,12 @@ a b
27692774
0 7
27702775
0 8
27712776
0 9
2772-
0 10
2773-
0 11
2774-
0 12
2775-
0 13
2776-
0 14
27772777
1 0
27782778
1 1
2779+
1 10
2780+
1 11
2781+
1 12
2782+
1 13
27792783
1 2
27802784
1 3
27812785
1 4
@@ -2784,12 +2788,12 @@ a b
27842788
1 7
27852789
1 8
27862790
1 9
2787-
1 10
2788-
1 11
2789-
1 12
2790-
1 13
27912791
2 0
27922792
2 1
2793+
2 10
2794+
2 11
2795+
2 12
2796+
2 13
27932797
2 2
27942798
2 3
27952799
2 4
@@ -2798,12 +2802,12 @@ a b
27982802
2 7
27992803
2 8
28002804
2 9
2801-
2 10
2802-
2 11
2803-
2 12
2804-
2 13
28052805
3 0
28062806
3 1
2807+
3 10
2808+
3 11
2809+
3 12
2810+
3 13
28072811
3 2
28082812
3 3
28092813
3 4
@@ -2812,10 +2816,6 @@ a b
28122816
3 7
28132817
3 8
28142818
3 9
2815-
3 10
2816-
3 11
2817-
3 12
2818-
3 13
28192819
explain select sql_buffer_result a, max(b)+1 from t1 where a = 0 group by a;
28202820
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
28212821
1 SIMPLE t1 NULL range PRIMARY,index index 4 NULL 3 100.00 Using where; Using index for group-by; Using temporary

‎mysql-test/r/insert.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ create table t2(id int not null auto_increment primary key, t2 varchar(50), uniq
6060
insert into t2 (t2) select distinct substring(email, locate('@', email)+1) from t1;
6161
select * from t2;
6262
id t2
63-
3 aol.com
64-
2 hotmail.com
6563
1 mysql.com
64+
2 hotmail.com
65+
3 aol.com
6666
drop table t1,t2;
6767
create database mysqltest;
6868
use mysqltest;

‎mysql-test/r/join_outer_bka.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3090,8 +3090,8 @@ FROM o LEFT JOIN m
30903090
ON m.machineid = o.machineid AND
30913091
m.orderid = o.orderid;
30923092
orderid machineid sep machineid orderid extra
3093-
2 m2 | m2 2 NULL
30943093
1 m2 | NULL NULL NULL
3094+
2 m2 | m2 2 NULL
30953095
DROP TABLE m, o;
30963096
# Bug#23086825: Incorrect query results using left join against derived
30973097
CREATE TABLE t1 (

‎mysql-test/r/join_outer_bka_nobnl.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3088,8 +3088,8 @@ FROM o LEFT JOIN m
30883088
ON m.machineid = o.machineid AND
30893089
m.orderid = o.orderid;
30903090
orderid machineid sep machineid orderid extra
3091-
2 m2 | m2 2 NULL
30923091
1 m2 | NULL NULL NULL
3092+
2 m2 | m2 2 NULL
30933093
DROP TABLE m, o;
30943094
# Bug#23086825: Incorrect query results using left join against derived
30953095
CREATE TABLE t1 (

‎mysql-test/r/myisam.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,8 @@ INSERT t1 VALUES ("can can");
484484
INSERT t1 VALUES ("can");
485485
SELECT * FROM t1;
486486
a
487-
can can
488487
can
488+
can can
489489
can can
490490
CHECK TABLE t1;
491491
Table Op Msg_type Msg_text

0 commit comments

Comments
 (0)