MDEV-16708: fix in test failures(added --enable_prepared_warnings/--disable_prepared_warnings)

dmitryshulga · vuvova · commit 97e8d27bed09 · 2021-06-17T19:30:24.000+02:00
diff --git a/mysql-test/include/column_compression_syntax_varbinary.inc b/mysql-test/include/column_compression_syntax_varbinary.inc
@@ -28,13 +28,16 @@ DROP TABLE t1;
 --echo # The following statements return deprecated syntax warnings
 --echo #
 
+--enable_prepare_warnings
+
 --eval CREATE TABLE t1 (a $type DEFAULT '' COMPRESSED)
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 --eval CREATE TABLE t1 (a $type NULL COMPRESSED)
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
+--disable_prepare_warnings
 
 --echo #
 --echo # The following statements fail by the grammar,
diff --git a/mysql-test/include/column_compression_syntax_varchar.inc b/mysql-test/include/column_compression_syntax_varchar.inc
@@ -53,6 +53,8 @@ DROP TABLE t1;
 --echo # The following statements return deprecated syntax warnings
 --echo #
 
+--enable_prepare_warnings
+
 --eval CREATE TABLE t1 (a $type BINARY COMPRESSED)
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
@@ -63,6 +65,7 @@ DROP TABLE t1;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
+--disable_prepare_warnings
 
 --echo #
 --echo # The following statements fail by the grammar,
diff --git a/mysql-test/suite/compat/oracle/t/sp-package-innodb.test b/mysql-test/suite/compat/oracle/t/sp-package-innodb.test
@@ -9,6 +9,8 @@ SELECT ENGINE FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
 INSERT INTO t1 VALUES (10,'none');
 
+--enable_prepare_warnings
+
 DELIMITER $$;
 CREATE PACKAGE pkg1 AS
   PROCEDURE p1;
@@ -58,5 +60,7 @@ ROLLBACK;
 SELECT * FROM t1 ORDER BY a;
 DELETE FROM t1;
 
+--disable_prepare_warnings
+
 DROP PACKAGE pkg1;
 DROP TABLE t1;
diff --git a/mysql-test/suite/compat/oracle/t/update_innodb.test b/mysql-test/suite/compat/oracle/t/update_innodb.test
@@ -8,6 +8,7 @@ SET sql_mode='ORACLE';
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY) engine=innodb;
 INSERT INTO t1 VALUES (1);
 START TRANSACTION;
+--enable_prepare_warnings
 SELECT a AS a_con1 FROM t1 INTO @a FOR UPDATE;
 
 --connect(con2,localhost,root,,)
@@ -24,5 +25,7 @@ COMMIT;
 SELECT a AS con2 FROM t1;
 COMMIT;
 
+--disable_prepare_warnings
+
 --connection default
 DROP TABLE t1;
diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result
@@ -189,7 +189,7 @@ select * from t2;
 a
 23
 connection master;
-drop function fn1;
+drop function fn1|
 create function fn1()
 returns int
 no sql
diff --git a/mysql-test/suite/funcs_1/include/innodb_tb2.inc b/mysql-test/suite/funcs_1/include/innodb_tb2.inc
@@ -3,6 +3,7 @@
 --disable_warnings
 drop table if exists tb2 ;
 --enable_warnings
+--enable_prepare_warnings
 create table tb2 (
 f59 numeric (0) unsigned,
 f60 numeric (64) unsigned,
@@ -61,3 +62,4 @@ f109 set("1set","2set") not null default "1set"
 eval
 load data infile '$MYSQLTEST_VARDIR/std_data/funcs_1/innodb_tb2.txt'
 into table tb2;
+--disable_prepare_warnings
diff --git a/mysql-test/suite/funcs_1/include/innodb_tb4.inc b/mysql-test/suite/funcs_1/include/innodb_tb4.inc
@@ -3,6 +3,7 @@
 --disable_warnings
 drop table if exists tb4;
 --enable_warnings
+--enable_prepare_warnings
 create table tb4 (
 f176 numeric (0) unsigned not null DEFAULT 9,
 f177 numeric (64) unsigned not null DEFAULT 9,
@@ -68,3 +69,4 @@ f241 char(100)
 eval
 load data infile '$MYSQLTEST_VARDIR/std_data/funcs_1/innodb_tb4.txt'
 into table tb4;
+--disable_prepare_warnings
diff --git a/mysql-test/suite/funcs_1/include/memory_tb2.inc b/mysql-test/suite/funcs_1/include/memory_tb2.inc
@@ -3,6 +3,9 @@
 --disable_warnings
 drop table if exists tb2 ;
 --enable_warnings
+
+--enable_prepare_warnings
+
 create table tb2 (
 f59 numeric (0) unsigned,
 f60 numeric (64) unsigned,
@@ -61,3 +64,5 @@ f109 set("1set","2set") not null default "1set"
 eval
 load data infile '$MYSQLTEST_VARDIR/std_data/funcs_1/memory_tb2.txt'
 into table tb2 ;
+
+--disable_prepare_warnings
diff --git a/mysql-test/suite/funcs_1/include/memory_tb4.inc b/mysql-test/suite/funcs_1/include/memory_tb4.inc
@@ -3,6 +3,7 @@
 --disable_warnings
 drop table if exists tb4 ;
 --enable_warnings
+--enable_prepare_warnings
 create table tb4 (
 f176 numeric (0) unsigned not null DEFAULT 9,
 f177 numeric (64) unsigned not null DEFAULT 9,
@@ -67,3 +68,4 @@ f240 varchar(1200)
 eval
 load data infile '$MYSQLTEST_VARDIR/std_data/funcs_1/memory_tb4.txt'
 into table tb4;
+--disable_prepare_warnings
diff --git a/mysql-test/suite/handler/handler.inc b/mysql-test/suite/handler/handler.inc
@@ -1293,13 +1293,15 @@ DROP TABLE IF EXISTS t1, t2;
 DROP FUNCTION IF EXISTS f1;
 --enable_warnings
 
+--enable_prepare_warnings
 delimiter |;
 CREATE FUNCTION f1() RETURNS INTEGER
 BEGIN
   SELECT 1 FROM t2 INTO @a;
   RETURN 1;
 END|
 delimiter ;|
+--disable_prepare_warnings
 
 # Get f1() parsed and cached
 --error ER_NO_SUCH_TABLE
diff --git a/mysql-test/suite/innodb/t/data_types.test b/mysql-test/suite/innodb/t/data_types.test
@@ -11,6 +11,8 @@
 
 --source include/have_innodb.inc
 
+--enable_prepare_warnings
+
 CREATE TABLE t1
 (
   t1_BIGINT BIGINT,
@@ -95,6 +97,8 @@ CREATE TABLE t1
   t1_VARMYSQL_0 VARCHAR(0) CHARACTER SET utf8
 ) ENGINE=InnoDB;
 
+--disable_prepare_warnings
+
 INSERT INTO t1 () VALUES ();
 
 SELECT
diff --git a/mysql-test/suite/innodb/t/innodb_bug30919.test b/mysql-test/suite/innodb/t/innodb_bug30919.test
@@ -22,6 +22,8 @@ eval CREATE TABLE test.part_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,
 
 ######## Create SPs, Functions, Views and Triggers Section ##############
 
+--enable_prepare_warnings
+
 delimiter |;
 
 CREATE PROCEDURE test.proc_part()
@@ -52,6 +54,8 @@ END|
 
 delimiter ;|
 
+--disable_prepare_warnings
+
 ############ Finish Setup Section ###################
 
 ############ Test Section ###################
diff --git a/mysql-test/suite/perfschema/t/alter_table_progress.test b/mysql-test/suite/perfschema/t/alter_table_progress.test
@@ -52,8 +52,10 @@ SET DEBUG_SYNC='copy_data_between_tables_before SIGNAL found_row WAIT_FOR wait_r
 SET DEBUG_SYNC='now WAIT_FOR found_row';
 
 # Find the statement id of the ALTER TABLE
+--enable_prepare_warnings
 select event_id from performance_schema.events_statements_current
   where thread_id = @con1_thread_id into @con1_stmt_id;
+--disable_prepare_warnings
 
 # completed 0
 select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
diff --git a/mysql-test/suite/perfschema/t/dml_handler.test b/mysql-test/suite/perfschema/t/dml_handler.test
@@ -21,6 +21,8 @@ CREATE TEMPORARY TABLE table_list (id INT AUTO_INCREMENT, PRIMARY KEY (id)) AS
   WHERE TABLE_SCHEMA='performance_schema'
   ORDER BY TABLE_NAME;
 
+--enable_prepare_warnings
+
 SELECT COUNT(*) FROM table_list INTO @table_count;
 
 let $count=`SELECT @table_count`;
@@ -39,5 +41,6 @@ while ($count > 0)
    dec $count;
 }
 
-DROP TEMPORARY TABLE table_list;
+--disable_prepare_warnings
 
+DROP TEMPORARY TABLE table_list;
diff --git a/mysql-test/suite/perfschema/t/selects.test b/mysql-test/suite/perfschema/t/selects.test
@@ -126,6 +126,7 @@ DROP TRIGGER t_ps_trigger;
 --disable_warnings
 DROP PROCEDURE IF EXISTS t_ps_proc;
 --enable_warnings
+--enable_prepare_warnings
 delimiter |;
 
 CREATE PROCEDURE t_ps_proc(IN conid INT, OUT pid INT)
@@ -140,6 +141,7 @@ delimiter ;|
 
 CALL t_ps_proc(connection_id(), @p_id);
 
+--disable_prepare_warnings
 # FUNCTION
 
 --disable_warnings
diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
@@ -188,7 +188,7 @@ select * from t2;
 a
 23
 connection master;
-drop function fn1;
+drop function fn1|
 create function fn1()
 returns int
 no sql
diff --git a/mysql-test/suite/rpl/t/rpl_bug31076.test b/mysql-test/suite/rpl/t/rpl_bug31076.test
@@ -1,3 +1,8 @@
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+   --skip Need regular protocol but ps-protocol was specified
+}
+
 source include/have_binlog_format_mixed_or_row.inc;
 source include/master-slave.inc;
 
diff --git a/mysql-test/suite/rpl/t/rpl_drop_db.test b/mysql-test/suite/rpl/t/rpl_drop_db.test
@@ -10,7 +10,9 @@ drop database if exists mysqltest1;
 create database mysqltest1;
 create table mysqltest1.t1 (n int);
 insert into mysqltest1.t1 values (1);
+--enable_prepare_warnings
 select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
+--disable_prepare_warnings
 create table mysqltest1.t2 (n int);
 create table mysqltest1.t3 (n int);
 --replace_result \\ / 66 39 93 39 17 39 247 39 41 39 "File exists" "Directory not empty"
diff --git a/mysql-test/suite/rpl/t/rpl_events.test b/mysql-test/suite/rpl/t/rpl_events.test
@@ -4,6 +4,11 @@
 # Purpose: To test that event effects are replicated.            #
 ##################################################################
 
+if (`SELECT $PS_PROTOCOL != 0`)
+{
+  --skip Need regular protocol but ps-protocol was specified
+}
+
 --source include/master-slave.inc
 
 SET @old_event_scheduler = @@global.event_scheduler;
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat.test b/mysql-test/suite/rpl/t/rpl_heartbeat.test
@@ -21,6 +21,7 @@ set @restore_slave_net_timeout= @@global.slave_net_timeout;
 set @@global.slave_net_timeout= 10;
 --enable_warnings
 
+--enable_prepare_warnings
 ###
 ### Checking the range
 ###
@@ -167,6 +168,8 @@ drop table t1;
 sync_slave_with_master;
 set @@global.slave_net_timeout= @restore_slave_net_timeout;
 
+--disable_prepare_warnings
+
 --source include/stop_slave.inc
 
 --echo End of tests
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
@@ -18,6 +18,8 @@
 --source include/have_binlog_format_mixed.inc
 --echo
 
+--enable_prepare_warnings
+
 # Set number of retries to connect to master
 let $connect_retry= 20;
 
@@ -561,5 +563,7 @@ DROP TABLE t1;
 --sync_slave_with_master
 SET @@global.slave_net_timeout=@restore_slave_net_timeout;
 
+--disable_prepare_warnings
+
 #--let $rpl_only_running_threads= 1
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test b/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
@@ -19,6 +19,7 @@ eval CREATE TABLE test.regular_tbl(id MEDIUMINT NOT NULL AUTO_INCREMENT,
 
 ######## Create SPs, Functions, Views and Triggers Section ##############
 
+--enable_prepare_warnings
 delimiter |;
 CREATE PROCEDURE test.proc_norm()
 BEGIN
@@ -46,7 +47,7 @@ BEGIN
 END|   
 
 delimiter ;|
-
+--disable_prepare_warnings
 ############ Finish Setup Section ###################
 
 
diff --git a/mysql-test/suite/rpl/t/rpl_mdev12179.test b/mysql-test/suite/rpl/t/rpl_mdev12179.test
@@ -285,8 +285,10 @@ EOF
 
 --connection server_2
 --enable_reconnect
+--enable_prepare_warnings
 --source include/wait_until_connected_again.inc
 SELECT max(seq_no) FROM mysql.gtid_slave_pos_InnoDB into @seq_no;
+--disable_prepare_warnings
 
 --connection server_1
 INSERT INTO t2(a) SELECT 1+MAX(a) FROM t2;
diff --git a/mysql-test/suite/rpl/t/rpl_misc_functions.test b/mysql-test/suite/rpl/t/rpl_misc_functions.test
@@ -89,8 +89,10 @@ INSERT INTO t1 (col_a) VALUES (test_replication_sf());
 
 --sync_slave_with_master
 
+--enable_prepare_warnings
 # Dump table on slave
 select * from t1 into outfile "../../tmp/t1_slave.txt";
+--disable_prepare_warnings
 
 # Load data from slave into temp table on master
 connection master;
diff --git a/mysql-test/suite/rpl/t/rpl_sp.test b/mysql-test/suite/rpl/t/rpl_sp.test
@@ -208,7 +208,7 @@ select * from t2;
 connection master;
 delimiter |;
 
-drop function fn1;
+drop function fn1|
 
 create function fn1()
        returns int
diff --git a/mysql-test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test
@@ -23,8 +23,10 @@ set innodb_fil_make_page_dirty_debug = ON;
 
 --echo # An example usage.
 create table t1 (f1 int primary key) engine = innodb;
+--enable_prepare_warnings
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_id;
+--disable_prepare_warnings
 set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = @space_id;
 drop table t1;
diff --git a/mysql-test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test b/mysql-test/suite/sys_vars/t/innodb_saved_page_number_debug_basic.test
@@ -23,8 +23,10 @@ set innodb_saved_page_number_debug = ON;
 
 --echo # An example usage.
 create table t1 (f1 int primary key) engine = innodb;
+--enable_prepare_warnings
 select space from information_schema.innodb_sys_tables
 where name = 'test/t1' into @space_id;
+--disable_prepare_warnings
 set global innodb_saved_page_number_debug = 0;
 set global innodb_fil_make_page_dirty_debug = @space_id;
 drop table t1;
diff --git a/mysql-test/suite/sys_vars/t/secure_file_priv.test b/mysql-test/suite/sys_vars/t/secure_file_priv.test
@@ -33,7 +33,9 @@ print FILE "SELECT load_file('",$protected_file,"') AS loaded_file;\n";
 close(FILE);
 EOF
 
+--enable_prepare_warnings
 --source $MYSQL_TMP_DIR/bug50373.inc
+--disable_prepare_warnings
 --remove_file $MYSQL_TMP_DIR/bug50373.inc
 --enable_query_log
 
diff --git a/mysql-test/suite/versioning/t/alter.test b/mysql-test/suite/versioning/t/alter.test
@@ -139,7 +139,9 @@ select * from t;
 update t set a=3 where a=1;
 select * from t;
 select * from t for system_time all;
+--enable_prepare_warnings
 select row_start from t where a=3 into @tm;
+--disable_prepare_warnings
 alter table t add column b int;
 select @tm=row_start from t where a=3;
 show create table t;
diff --git a/mysql-test/suite/versioning/t/commit_id.test b/mysql-test/suite/versioning/t/commit_id.test
diff --git a/mysql-test/suite/versioning/t/create.test b/mysql-test/suite/versioning/t/create.test
diff --git a/mysql-test/suite/versioning/t/foreign.test b/mysql-test/suite/versioning/t/foreign.test
diff --git a/mysql-test/suite/versioning/t/insert.test b/mysql-test/suite/versioning/t/insert.test
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
diff --git a/mysql-test/suite/versioning/t/select.test b/mysql-test/suite/versioning/t/select.test
diff --git a/mysql-test/suite/versioning/t/select2.test b/mysql-test/suite/versioning/t/select2.test
diff --git a/mysql-test/suite/versioning/t/trx_id.test b/mysql-test/suite/versioning/t/trx_id.test

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ select * from t2;`
`189`	`189`	`a`
`190`	`190`	`23`
`191`	`191`	`connection master;`
`192`		`-drop function fn1;`
	`192`	`+drop function fn1\|`
`193`	`193`	`create function fn1()`
`194`	`194`	`returns int`
`195`	`195`	`no sql`