Skip to content

Commit 71292fb

Browse files
committed
Match mysqltest commands case-insensitively
1 parent 81bbde0 commit 71292fb

File tree

4 files changed

+2
-332
lines changed

4 files changed

+2
-332
lines changed

tests/parser/data/failures.csv

Lines changed: 0 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"reset binary logs and gtids"
22
"CHECK TABLES t1"
3-
"EVAL insert into t1 values (2,2),(2,2),(2,2),(2,2),(2,2)"
43
"alter table t1 algorithm=inplace, rename key k to kk"
54
"alter table t2 algorithm=inplace, rename key k to kk"
65
"alter table t1 algorithm=copy, rename key kkk to kkkk"
@@ -193,21 +192,6 @@ CAST(TIMESTAMP'2000-01-01 23:59:59.123456' AS DOUBLE)"
193192
"CREATE PROCEDURE p_flush_status()
194193
BEGIN
195194
DECLARE x INT DEFAULT 3000"
196-
"WHILE x DO
197-
SET x = x-1"
198-
"END WHILE"
199-
"END |
200-
201-
CREATE PROCEDURE p_processlist()
202-
BEGIN
203-
DECLARE x INT DEFAULT 3000"
204-
"END |
205-
206-
207-
208-
209-
210-
let $i = 3000"
211195
"RESET PERSIST character_set_server"
212196
"CREATE TABLE 🐬(a INT)"
213197
"CREATE TABLE t1(🐬 INT)"
@@ -315,13 +299,6 @@ END IF;
315299
END;"
316300
"CREATE TABLE t1 (f1 INT, f2 INT, f3 INT, f4 FLOAT AS (f3 * 0.01), f5 INT,
317301
CHECK (f1 < f2))"
318-
"CONNECT (con1, localhost, root)"
319-
"CONNECT (con2, localhost, root)"
320-
"CONNECTION con1"
321-
"CONNECTION con2"
322-
"CONNECTION default"
323-
"DISCONNECT con1"
324-
"DISCONNECT con2"
325302
"my $mode = (stat($ENV{SESSION_FILE}))[2]"
326303
"my $perm = sprintf ""%04o"", ($mode & 07777)"
327304
"/* line with only comment */"
@@ -433,7 +410,6 @@ create table t1 as select 1"
433410
"CREATE TRIGGER f BEFORE INSERT ON t1 FOR EACH ROW
434411
BEGIN
435412
INSERT INTO t1 ( `int` ) VALUES (4 ),( 8 ),( 2 ) "
436-
"END "
437413
"|
438414

439415

@@ -1121,7 +1097,6 @@ end"
11211097
"EOF
11221098

11231099
DROP DATABASE bug19573998"
1124-
"LET $MYSQLD_DATADIR = `SELECT @@datadir`"
11251100
"my $file= $ENV{'GREP_FILE'} or die(""grep file not set"")"
11261101
"my $pattern= $ENV{'GREP_PATTERN'} or die(""pattern is not set"")"
11271102
"open(FILE, ""$file"") or die(""Unable to open $file: $!"")"
@@ -1158,12 +1133,6 @@ enable_query_log
11581133
"insert into ��� (���0) values (2)"
11591134
"explain select ���0 from ��� where ���0=1"
11601135
"drop table ���"
1161-
"CONNECT (c1,localhost,root,,)"
1162-
"CONNECT (c2,localhost,root,,)"
1163-
"CONNECTION c1"
1164-
"CONNECTION c2"
1165-
"DISCONNECT c1"
1166-
"DISCONNECT c2"
11671136
"EXPLAIN ((SELECT a FROM t ORDER BY 1 LIMIT 3) ORDER BY -a LIMIT 2) ORDER BY a"
11681137
"CREATE TABLE t3 LIKE t2"
11691138
"EXPLAIN
@@ -1310,16 +1279,7 @@ foreign key (a,b) references t3 (c,d) on update set null) engine=myisam"
13101279
"SELECT cast(TIMESTAMP'2019-10-10 10:11:12' AT TIME ZONE '+00:00' AS DATETIME)"
13111280
"SELECT cast(TIMESTAMP'2019-10-10 10:11:12+00:00' AT TIME ZONE '+00:00' AS DATETIME)"
13121281
"SELECT cast( a AT TIME ZONE '+00:00' AS DATETIME ) FROM t1"
1313-
"LET $have_debug= `SELECT (version() LIKE '%debug%')`"
1314-
"IF ($have_debug)
1315-
{
1316-
disable_query_log"
13171282
enable_result_log
1318-
"LET $c = 96"
1319-
"WHILE ($c)
1320-
{
1321-
EVAL INSERT INTO r SELECT $c, HEX(@a << $c), HEX(@a >> $c)"
1322-
"DEC $c"
13231283
"SELECT ADDDATE(DATE'2021-01-01', INTERVAL 1 DAY)"
13241284
"SELECT ADDDATE(DATE'2021-01-01', INTERVAL 1 HOUR)"
13251285
"SELECT ADDDATE(TIMESTAMP'2021-01-01 00:00:00', INTERVAL 1 DAY)"
@@ -1561,8 +1521,6 @@ COALESCE(JSON_OBJECT('a', 1), NULL) AS c71"
15611521
"select 1 from t1 where 1 < some (select cast(a as datetime) from t1)"
15621522
"SELECT * FROM t1 WHERE TIMESTAMPDIFF(MONTH, a, TIMESTAMP'0000-00-01 00:00:00') IS NULL"
15631523
"SELECT * FROM t1 WHERE TIMESTAMPDIFF(MONTH, a, DATE'0000-00-01') IS NULL"
1564-
"EVAL $query"
1565-
"EVAL CREATE TABLE t3 AS $query"
15661524
"CREATE TABLE t1(col1 varchar(100), gcol2 binary(16) AS (uuid_to_bin(col1)) virtual, index(gcol2))"
15671525
"CREATE TABLE t2(col1 binary(16), gcol2 varchar(36) AS (bin_to_uuid(col1)) virtual, index(col1), index(gcol2))"
15681526
"select hex(weight_string('aa' as binary(3)))"
@@ -1656,26 +1614,6 @@ RESIGNAL SET MYSQL_ERRNO= 9999, MESSAGE_TEXT= 'Changed by resignal, for caller';
16561614
END;
16571615
SELECT 10 + 'a';
16581616
END"
1659-
"LET $wait_condition=
1660-
SELECT COUNT(*) = 1 FROM performance_schema.events_waits_current
1661-
WHERE event_name LIKE '%COND_open'"
1662-
"LET $wait_condition=
1663-
SELECT event_id != @first_wait_id
1664-
FROM performance_schema.events_waits_current
1665-
WHERE event_name LIKE '%COND_open'"
1666-
"LET $wait_condition=
1667-
SELECT COUNT(*) = 1 FROM information_schema.processlist
1668-
WHERE state LIKE 'Waiting for table flush' AND info LIKE 'FLUSH TABLES'"
1669-
"LET $wait_condition=
1670-
SELECT COUNT(*) = 1 FROM information_schema.processlist
1671-
WHERE state LIKE 'Waiting for table flush' AND info LIKE 'FLUSH TABLES tb'"
1672-
"LET $wait_condition=
1673-
SELECT COUNT(*) = 0 FROM information_schema.processlist
1674-
WHERE state LIKE 'Waiting for table flush' AND info LIKE 'FLUSH TABLES'"
1675-
"LET $wait_condition=
1676-
SELECT COUNT(*) = 1 FROM information_schema.processlist
1677-
WHERE state LIKE 'Waiting for table metadata lock'
1678-
AND info LIKE 'CREATE TABLE tb%'"
16791617
"DO ST_ASTEXT(ST_UNION(ST_GEOMFROMTEXT('POLYGON((525000 183300,525400
16801618
183300,525400 18370, 525000 183700,525000 183300))'),
16811619
ST_GeomFromText('POLYGON((525298.67 183511.53,525296.57
@@ -1833,7 +1771,6 @@ boundary POLYGON)"
18331771
"DROP USER очень_длинный_юз@localhost"
18341772
"DROP USER очень_очень_длинный_юзер@localhost"
18351773
"DROP USER очень_очень_очень_длинный_юзер__@localhost"
1836-
"CONNECT (conn_su,localhost,user_name_len_22_01234,,)"
18371774
"REVOKE ALL PRIVILEGES ON mysqltest.v0 FROM mysqltest@localhost"
18381775
"REVOKE ALL PRIVILEGES ON mysqltest.visible FROM mysqltest@localhost"
18391776
"REVOKE ALL ON mysqltest_1.t1 FROM mysqltest_1@'127.0.0.0/255.0.0.0'"
@@ -1873,11 +1810,8 @@ bug20625566_user@localhost, bug20625566_dest@localhost"
18731810
"ALTER USER u1@localhost DEFAULT ROLE r1"
18741811
"REVOKE ALL ON *.* FROM u1@localhost"
18751812
"REVOKE ALL ON *.* FROM u1"
1876-
"DISCONNECT con_admin_test"
1877-
"CONNECTION con_admin_test"
18781813
"SHOW GRANTS FOR u1 using r1"
18791814
"SHOW GRANTS FOR u1 using r2"
1880-
"DISCONNECT con_rep_slave_test"
18811815
"REVOKE ALL ON *.* FROM CURRENT_USER()"
18821816
"RESET REPLICA ALL"
18831817
enable_connect_log
@@ -2317,7 +2251,6 @@ SELECT /*+ SET_VAR(optimizer_max_subgraph_pairs = 1) */ COUNT(*)
23172251
FROM t AS t1 LEFT JOIN t AS t2 ON TRUE,
23182252
LATERAL (SELECT DISTINCT t2.a FROM t) AS t3
23192253
WHERE t1.a = t3.a"
2320-
"LET $OLD_DB= `SELECT DATABASE()`"
23212254
"chdir $ENV{'MYSQL_TMP_DIR'}"
23222255
"EOF
23232256
let $EXPORT_DIR= $MYSQL_TMP_DIR/export"
@@ -2553,7 +2486,6 @@ connect
25532486
into table t1 fields terminated by ',' ignore 2 lines"
25542487
"load data infile '../../std_data/loaddata1.dat' in primary key order
25552488
into table t1 fields terminated by ',' ignore 2 lines"
2556-
"EVAL SELECT 0xE1C330 INTO OUTFILE 't1.dat'"
25572489
"CREATE TABLE t1 (
25582490
json_col JSON , KEY json_col ((CAST(json_col -> '$' AS UNSIGNED ARRAY)))
25592491
)"
@@ -2800,50 +2732,8 @@ set names utf8mb3"
28002732

28012733

28022734
drop table if exists t1Aa,t2Aa,v1Aa,v2Aa"
2803-
"LET $wait_condition=
2804-
SELECT COUNT(*) = 1 FROM information_schema.processlist
2805-
WHERE state LIKE 'Waiting for tablespace metadata lock' AND
2806-
info LIKE 'ALTER TABLESPACE%'"
2807-
"LET $wait_condition=
2808-
SELECT COUNT(*) = 2 FROM information_schema.processlist
2809-
WHERE state LIKE 'Waiting for tablespace metadata lock' AND
2810-
info LIKE '%TABLESPACE%'"
2811-
"LET $wait_condition=
2812-
SELECT COUNT(*) = 0 FROM information_schema.processlist
2813-
WHERE state LIKE 'Waiting for tablespace metadata lock' AND
2814-
info LIKE 'ALTER TABLESPACE%'"
2815-
"LET $wait_condition=
2816-
SELECT COUNT(*) = 2 FROM information_schema.processlist
2817-
WHERE state LIKE 'Waiting for tablespace metadata lock' AND
2818-
info LIKE 'DROP TABLESPACE%'"
2819-
"LET $wait_condition=
2820-
SELECT COUNT(*) = 0 FROM information_schema.processlist
2821-
WHERE state LIKE 'Waiting for tablespace metadata lock' AND
2822-
info LIKE 'DROP TABLESPACE%'"
2823-
"LET $wait_condition=
2824-
SELECT COUNT(*) = 1 FROM information_schema.processlist
2825-
WHERE state LIKE 'Waiting for tablespace metadata lock' AND
2826-
info LIKE 'DROP TABLESPACE%'"
28272735
"CREATE TABLE t1_new LIKE t1_src"
28282736
"CREATE TABLE t2_new LIKE t2_src"
2829-
"LET $wait_condition=
2830-
SELECT COUNT(*) = 2 FROM performance_schema.metadata_locks
2831-
WHERE object_type LIKE 'TABLESPACE'"
2832-
"LET $wait_condition=
2833-
SELECT COUNT(*) = 1 FROM performance_schema.events_waits_current
2834-
WHERE object_type LIKE 'TABLESPACE'"
2835-
"LET $wait_condition=
2836-
SELECT COUNT(*) = 0 FROM performance_schema.metadata_locks
2837-
WHERE object_type LIKE 'TABLESPACE'"
2838-
"LET $wait_condition=
2839-
SELECT COUNT(*) = 1 FROM performance_schema.events_waits_history_long
2840-
WHERE object_type LIKE 'TABLESPACE' AND object_name LIKE 'ts1'"
2841-
"LET $wait_condition=
2842-
SELECT COUNT(*) = 1 FROM performance_schema.metadata_locks
2843-
WHERE object_type LIKE 'TABLESPACE' AND object_name LIKE 'ts1'"
2844-
"LET $wait_condition=
2845-
SELECT COUNT(*) = 1 FROM performance_schema.metadata_locks
2846-
WHERE object_type LIKE 'TABLESPACE' AND object_name LIKE 'ts2'"
28472737
"CREATE TABLE m1 LIKE t1"
28482738
"CREATE TABLE m1(a INT) ENGINE=MERGE UNION=()"
28492739
"ALTER TABLE m1 UNION=()"
@@ -2860,10 +2750,6 @@ WHERE object_type LIKE 'TABLESPACE' AND object_name LIKE 'ts2'"
28602750
"SET @before:= (SELECT MAX_DATA_LENGTH FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test')"
28612751
"SELECT @before=@after"
28622752
"CREATE TABLE ta (pk INT, embedding VECTOR(4), PRIMARY KEY (pk)) ENGINE=MyISAM"
2863-
"CONNECT (insertConn, localhost, root,,)"
2864-
"SEND INSERT INTO t1(id) SELECT id FROM t2"
2865-
"CONNECTION insertConn"
2866-
"DISCONNECT insertConn"
28672753
"FLUSH TABLE mysql_db1.t1"
28682754
"print FILE ""select\n"""
28692755
"print FILE ""'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a',\n"" x 3400"
@@ -3195,7 +3081,6 @@ PARTITION p3 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */"
31953081
(SELECT c3 FROM t1 t WHERE t.c3 < TIMESTAMP'2011-04-26 19:19:44'
31963082
AND t.c3 > TIMESTAMP'2011-04-26 19:18:44') "
31973083
"ALTER TABLE t1 IMPORT TABLESPACE"
3198-
"LET $MYSQL_DATA_DIR = `select @@datadir`"
31993084
"CREATE TABLE `t``\"""e` (a INT, PRIMARY KEY (a))
32003085
ENGINE=InnoDB
32013086
PARTITION BY RANGE (a)
@@ -3209,16 +3094,6 @@ SUBPARTITION `sp3``\"""e`))"
32093094
"INSERT INTO `t``\"""e` VALUES (0), (2), (6), (10), (14), (18), (22)"
32103095
SEND
32113096
"DROP TABLE `t``\"""e`"
3212-
"LET $MYSQLD_DATADIR = `select @@datadir`"
3213-
"LET $INNODB_PAGE_SIZE = `select @@innodb_page_size`"
3214-
"LET $data_directory = DATA DIRECTORY='$MYSQL_TMP_DIR/alternate_dir/data'"
3215-
"LET $data_directory2 = DATA DIRECTORY='$MYSQL_TMP_DIR/alternate_dir/data2'"
3216-
"LET $index_directory = INDEX DIRECTORY='$MYSQL_TMP_DIR/alternate_dir/data'"
3217-
"LET $innodb_file_per_table_orig=`select @@global.innodb_file_per_table`"
3218-
"LET $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`"
3219-
"EVAL SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig"
3220-
"EVAL SET SESSION innodb_strict_mode=$innodb_strict_mode_orig"
3221-
"EVAL SET @@default_storage_engine=$old_default_storage_engine"
32223097
"DELETE FROM t1 PARTITION (p0)
32233098
WHERE a = (SELECT a + 2 FROM t2 WHERE a = 1)"
32243099
"EXPLAIN DELETE FROM t1 PARTITION (p0)
@@ -3611,9 +3486,6 @@ ON *.* FROM u1, u2 IGNORE UNKNOWN USER"
36113486
"REVOKE IF EXISTS r1 FROM u1"
36123487
"REVOKE IF EXISTS r1 FROM r2"
36133488
"REVOKE IF EXISTS r1 FROM u1,u2,u3,r2"
3614-
"LET old_log_output= `select @@global.log_output`"
3615-
"LET old_general_log= `select @@global.general_log`"
3616-
"LET old_general_log_file= `select @@global.general_log_file`"
36173489
"CHANGE REPLICATION SOURCE TO SOURCE_PASSWORD='azundris3'"
36183490
"SET PASSWORD = '' REPLACE ''"
36193491
"ALTER USER u1 IDENTIFIED BY '123' REPLACE '', u2 IDENTIFIED BY '456'
@@ -3670,9 +3542,6 @@ SOURCE_DELAY = 4711, SOURCE_AUTO_POSITION = 0 FOR CHANNEL 'chan_jackie'"
36703542
"SHOW GRANTS FOR u1@localhost USING u1234567890123456789012345678901"
36713543
"ALTER USER r2 DEFAULT ROLE r1"
36723544
"ALTER USER baseuser default role r2"
3673-
"DISCONNECT con_base"
3674-
"DISCONNECT con_admin1"
3675-
"DISCONNECT con_admin2"
36763545
"ALTER USER u1 DEFAULT ROLE r1"
36773546
"ALTER USER u1@localhost DEFAULT ROLE 'r1'"
36783547
"SHOW GRANTS FOR CURRENT_USER() USING r1"
@@ -3711,8 +3580,6 @@ COMMIT"
37113580
"ALTER TABLE dst_t2 IMPORT PARTITION p0 TABLESPACE"
37123581
"CREATE TABLE tæøå(i INT)"
37133582
"DROP TABLE tæøå"
3714-
"LET $MYSQL_TMP_DIR_UCASE= `SELECT upper('$MYSQL_TMP_DIR')`"
3715-
"LET $MYSQL_TMP_DIR_LCASE= `SELECT lower('$MYSQL_TMP_DIR')`"
37163583
"START TRANSACTION READ ONLY, WITH CONSISTENT SNAPSHOT"
37173584
"SET TRANSACTION READ ONLY, ISOLATION LEVEL SERIALIZABLE"
37183585
"CREATE TABLE t1 (i int, KEY USING HASH (i)) ENGINE=MEMORY"
@@ -5526,12 +5393,6 @@ $$
55265393
"
55275394
"SELECT 1 AS $hi"
55285395
"revoke all privileges on procedure sptest.p1 from userb@localhost"
5529-
"CONNECT (con_tester,localhost,tester,,B48872)"
5530-
"CONNECT (con_tester_denied,localhost,Tester,,B48872)"
5531-
"CONNECTION con_tester"
5532-
"CONNECTION con_tester_denied"
5533-
"DISCONNECT con_tester"
5534-
"DISCONNECT con_tester_denied"
55355396
"CREATE PROCEDURE p2()
55365397
BEGIN
55375398
DECLARE i TINYINT DEFAULT 3;
@@ -5831,8 +5692,6 @@ CREATE FUNCTION f1(loops INT UNSIGNED)
58315692
RETURNS INT
58325693
BEGIN
58335694
DECLARE tmp INT"
5834-
"WHILE loops > 0 DO
5835-
SELECT c1 INTO tmp FROM v1"
58365695
"RETURN loops"
58375696
"END|
58385697

@@ -5884,7 +5743,6 @@ insert into t1 values (null)"
58845743
"end|
58855744

58865745
reset binary logs and gtids"
5887-
"LET $ID= `SELECT connection_id()`"
58885746
"ALTER INSTANCE RELOAD TLS"
58895747
"ALTER INSTANCE RELOAD TLS NO ROLLBACK ON ERROR"
58905748
"SELECT 1 FROM t1 AS table2 LEFT JOIN (SELECT 'c') AS table3(f1)
@@ -6066,18 +5924,6 @@ end"
60665924
BEFORE INSERT ON t1 FOR EACH ROW SET @sum= @sum + NEW.f1"
60675925
"SHOW CREATE TRIGGER очень_очень_очень_очень_очень_очень_очень_очень_длинная_строка_é"
60685926
"DROP TRIGGER очень_очень_очень_очень_очень_очень_очень_очень_длинная_строка_é"
6069-
"CONNECT (rl_holder, localhost, root,,)"
6070-
"CONNECT (rl_acquirer, localhost, root,,)"
6071-
"CONNECT (wl_acquirer, localhost, root,,)"
6072-
"CONNECT (rl_contender, localhost, root,,)"
6073-
"CONNECTION rl_holder"
6074-
"CONNECTION rl_acquirer"
6075-
"CONNECTION wl_acquirer"
6076-
"CONNECTION rl_contender"
6077-
"DISCONNECT rl_acquirer"
6078-
"DISCONNECT wl_acquirer"
6079-
"DISCONNECT rl_contender"
6080-
"DISCONNECT rl_holder"
60815927
"CREATE TABLE t1(a INT, b TEXT, KEY (a)) SECONDARY_ENGINE=MOCK"
60825928
"SELECT * FROM t2 EXCEPT SELECT * FROM t3"
60835929
"SELECT * FROM t3 EXCEPT SELECT * FROM t2"
@@ -6556,10 +6402,6 @@ ORDER BY c2 DESC, c1 ASC LIMIT 1
65566402
"CREATE TRIGGER trig_t1_ins BEFORE INSERT ON t1 FOR EACH ROW
65576403
BEGIN
65586404
SET @aux = GET_LOCK(2,1)"
6559-
"IF @aux <> 1 THEN
6560-
SIGNAL SQLSTATE '45000'
6561-
SET MESSAGE_TEXT = 'LOCK 2 not got. Abort.', MYSQL_ERRNO = 9999"
6562-
"END IF"
65636405
END
65646406
"|
65656407
SELECT GET_LOCK(CAST(2 AS CHAR),0)"
@@ -6612,12 +6454,6 @@ eval SET @@global.validate_password.dictionary_file=""$MYSQLTEST_VARDIR/tmp/dict
66126454
"set @select=2,@t5=1.23456"
66136455
"set @test_int=10,@test_double=1e-10,@test_string=""abcdeghi"",@test_string2=""abcdefghij"",@select=NULL"
66146456
"select @test_int,@test_double,@test_string,@test_string2,@select"
6615-
"CONNECT (con1,localhost,root,,test)"
6616-
"CONNECT (vtcon1, localhost, u1, foo,)"
6617-
"CONNECT (vtcon2, localhost, root,,)"
6618-
"CONNECT (vtcon3, localhost, root,,)"
6619-
"CONNECTION vtcon1"
6620-
"CONNECTION vtcon2"
66216457
"drop table if exists t1,t2,t3,t4,t9,`t1a``b`,v1,v2,v3,v4,v5,v6"
66226458
"drop view if exists t1,t2,`t1a``b`,v1,v2,v3,v4,v5,v6"
66236459
"create table `t1a``b` (col1 char(2))"
@@ -7165,5 +7001,4 @@ order by find_in_set(ln.n,eq.pivot_lines), ln.n;
71657001
end
71667002

71677003
"
7168-
"SEND UPDATE t1 SET a=5 WHERE a=2"
71697004
"SELECT AVG(DISTINCT EXTRACTVALUE((''),('$@k')))"

0 commit comments

Comments
 (0)