MDEV-37375 engines/iuds suite fails with ps-protocol

vuvova · vuvova · commit ed81e5f456ac · 2025-09-15T11:00:02.000+02:00
and collateral cleanup
diff --git a/mysql-test/suite/engines/funcs/r/ai_sql_auto_is_null.result b/mysql-test/suite/engines/funcs/r/ai_sql_auto_is_null.result
@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(c1 TINYINT   AUTO_INCREMENT NULL KEY );
 SET SQL_AUTO_IS_NULL = 1;
 INSERT INTO t1 VALUES(null);
diff --git a/mysql-test/suite/engines/funcs/r/ld_all_number_string_calendar_types.result b/mysql-test/suite/engines/funcs/r/ld_all_number_string_calendar_types.result
@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (c1 TINYINT NOT NULL PRIMARY KEY, c2 CHAR(10), c3 DATE);
 LOAD DATA LOCAL INFILE 'suite/engines/funcs/t/load_simple.inc' INTO TABLE t1 FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n';
 Warnings:
diff --git a/mysql-test/suite/engines/funcs/r/sf_alter.result b/mysql-test/suite/engines/funcs/r/sf_alter.result
@@ -1,5 +1,3 @@
-DROP TABLE IF EXISTS t1,t2,t3,t4;
-DROP FUNCTION IF EXISTS sf1;
 CREATE TABLE t1 (id INTEGER NULL , data INTEGER NULL, KEY(id));
 CREATE TABLE t2 (i INTEGER NULL);
 CREATE TABLE t3 (id INTEGER NULL, data INTEGER NULL, KEY(id));
diff --git a/mysql-test/suite/engines/funcs/r/sf_cursor.result b/mysql-test/suite/engines/funcs/r/sf_cursor.result
@@ -1,5 +1,3 @@
-DROP TABLE IF EXISTS t1,t2,t3,t4;
-DROP FUNCTION IF EXISTS sf1;
 CREATE TABLE t1 (id INTEGER NULL , data INTEGER NULL, KEY(id));
 CREATE TABLE t2 (i INTEGER NULL);
 CREATE TABLE t3 (id INTEGER NULL, data INTEGER NULL, KEY(id));
diff --git a/mysql-test/suite/engines/funcs/t/ai_sql_auto_is_null.test b/mysql-test/suite/engines/funcs/t/ai_sql_auto_is_null.test
@@ -1,6 +1,4 @@
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
+--disable_ps2_protocol
 CREATE TABLE t1(c1 TINYINT   AUTO_INCREMENT NULL KEY );
 SET SQL_AUTO_IS_NULL = 1;
 INSERT INTO t1 VALUES(null);
diff --git a/mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test b/mysql-test/suite/engines/funcs/t/ld_all_number_string_calendar_types.test
diff --git a/mysql-test/suite/engines/funcs/t/sf_alter.test b/mysql-test/suite/engines/funcs/t/sf_alter.test
@@ -1,7 +1,4 @@
---disable_warnings
-DROP TABLE IF EXISTS t1,t2,t3,t4;
-DROP FUNCTION IF EXISTS sf1;
---enable_warnings
+--disable_ps2_protocol
 CREATE TABLE t1 (id INTEGER NULL , data INTEGER NULL, KEY(id));
 CREATE TABLE t2 (i INTEGER NULL);
 CREATE TABLE t3 (id INTEGER NULL, data INTEGER NULL, KEY(id));
diff --git a/mysql-test/suite/engines/funcs/t/sf_cursor.test b/mysql-test/suite/engines/funcs/t/sf_cursor.test
@@ -1,7 +1,4 @@
---disable_warnings
-DROP TABLE IF EXISTS t1,t2,t3,t4;
-DROP FUNCTION IF EXISTS sf1;
---enable_warnings
+--disable_ps2_protocol
 CREATE TABLE t1 (id INTEGER NULL , data INTEGER NULL, KEY(id));
 CREATE TABLE t2 (i INTEGER NULL);
 CREATE TABLE t3 (id INTEGER NULL, data INTEGER NULL, KEY(id));
diff --git a/mysql-test/suite/engines/iuds/r/delete_year.result b/mysql-test/suite/engines/iuds/r/delete_year.result
@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS t1,t2,t3,t4;
 CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));
 CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));
 CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));
diff --git a/mysql-test/suite/engines/iuds/r/insert_year.result b/mysql-test/suite/engines/iuds/r/insert_year.result
@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS t1,t2,t3,t4;
 CREATE TABLE t1(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2));
 CREATE TABLE t2(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1,c2));
 CREATE TABLE t3(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, UNIQUE INDEX idx(c1,c2));
diff --git a/mysql-test/suite/engines/iuds/r/update_year.result b/mysql-test/suite/engines/iuds/r/update_year.result
@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS t1,t2,t3,t4;
 CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));
 CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));
 CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));
diff --git a/mysql-test/suite/engines/iuds/t/delete_year.test b/mysql-test/suite/engines/iuds/t/delete_year.test
@@ -1,11 +1,10 @@
---disable_warnings
-DROP TABLE IF EXISTS t1,t2,t3,t4;
---enable_warnings
 # Create tables
 CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));
 CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));
+--enable_prepare_warnings
 CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));
 CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2));
+--disable_prepare_warnings
 #Insert as 4-digit number format in the range '1901' to '2155'
 INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
 INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
diff --git a/mysql-test/suite/engines/iuds/t/insert_year.test b/mysql-test/suite/engines/iuds/t/insert_year.test
@@ -1,14 +1,12 @@
---disable_warnings
-DROP TABLE IF EXISTS t1,t2,t3,t4;
---enable_warnings
-
 ######## Running INSERT tests for YEAR(4) ########
 
 # Create tables
 CREATE TABLE t1(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2));
 CREATE TABLE t2(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1,c2));
+--enable_prepare_warnings
 CREATE TABLE t3(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, UNIQUE INDEX idx(c1,c2));
 CREATE TABLE t4(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME);
+--disable_prepare_warnings
 # Insert some rows with targeted values
 
 # As a four-digit string in the range '1901' to '2155'
@@ -761,10 +759,12 @@ DROP TABLE t1,t2,t3,t4;
 ######## Running INSERT tests for YEAR(2) ########
 
 # Create tables
+--enable_prepare_warnings
 CREATE TABLE t1(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2));
 CREATE TABLE t2(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1,c2));
 CREATE TABLE t3(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, UNIQUE INDEX idx(c1,c2));
 CREATE TABLE t4(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME);
+--disable_prepare_warnings
 # Insert some rows with targeted values
 
 # As a four-digit string in the range '1901' to '2155'
diff --git a/mysql-test/suite/engines/iuds/t/update_year.test b/mysql-test/suite/engines/iuds/t/update_year.test
@@ -1,11 +1,10 @@
---disable_warnings
-DROP TABLE IF EXISTS t1,t2,t3,t4;
---enable_warnings
 # Create tables
 CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));
 CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));
+--enable_prepare_warnings
 CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));
 CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2));
+--disable_prepare_warnings
 #Insert as 4-digit number format in the range '1901' to '2155'
 INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
 INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-DROP TABLE IF EXISTS t1;`
`2`	`1`	`CREATE TABLE t1(c1 TINYINT AUTO_INCREMENT NULL KEY );`
`3`	`2`	`SET SQL_AUTO_IS_NULL = 1;`
`4`	`3`	`INSERT INTO t1 VALUES(null);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-DROP TABLE IF EXISTS t1;`
`2`	`1`	`CREATE TABLE t1 (c1 TINYINT NOT NULL PRIMARY KEY, c2 CHAR(10), c3 DATE);`
`3`	`2`	`LOAD DATA LOCAL INFILE 'suite/engines/funcs/t/load_simple.inc' INTO TABLE t1 FIELDS TERMINATED BY ',' LINES TERMINATED BY '\n';`
`4`	`3`	`Warnings:`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-DROP TABLE IF EXISTS t1,t2,t3,t4;`
`2`		`-DROP FUNCTION IF EXISTS sf1;`
`3`	`1`	`CREATE TABLE t1 (id INTEGER NULL , data INTEGER NULL, KEY(id));`
`4`	`2`	`CREATE TABLE t2 (i INTEGER NULL);`
`5`	`3`	`CREATE TABLE t3 (id INTEGER NULL, data INTEGER NULL, KEY(id));`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-DROP TABLE IF EXISTS t1,t2,t3,t4;`
`2`	`1`	`CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));`
`3`	`2`	`CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));`
`4`	`3`	`CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-DROP TABLE IF EXISTS t1,t2,t3,t4;`
`2`	`1`	`CREATE TABLE t1(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2));`
`3`	`2`	`CREATE TABLE t2(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1,c2));`
`4`	`3`	`CREATE TABLE t3(c1 YEAR(4) NOT NULL, c2 YEAR(4) NULL, c3 DATE, c4 DATETIME, UNIQUE INDEX idx(c1,c2));`