MDEV-29625 Some clients/scripts refer to old slow log variables

client/mysqlbinlog.cc

@@ -3690,7 +3690,7 @@ int main(int argc, char** argv)
     fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;\n");
 
     fprintf(result_file,
-	    "/*!40019 SET @@session.max_insert_delayed_threads=0*/;\n");
+	    "/*!40019 SET @@session.max_delayed_threads=0*/;\n");
 
     if (disable_log_bin)
       fprintf(result_file,

client/mysqldump.c

@@ -784,7 +784,7 @@ static void write_header(FILE *sql_file, const char *db_name)
 
     if (!opt_logging)
       fprintf(sql_file,
-"\n/*M!100101 SET LOCAL SQL_LOG_OFF=0, LOCAL SLOW_QUERY_LOG=0 */;");
+"\n/*M!100101 SET LOCAL SQL_LOG_OFF=0, LOCAL LOG_SLOW_QUERY=0 */;");
 
     if (opt_set_charset)
       fprintf(sql_file,
@@ -5445,7 +5445,7 @@ static int init_dumping_mysql_tables(char *qdatabase)
   if (opt_drop_database)
     fprintf(md_result_file,
             "\n/*!50106 SET @save_log_output=@@LOG_OUTPUT*/;\n"
-            "/*M!100203 EXECUTE IMMEDIATE IF(@@LOG_OUTPUT='TABLE' AND (@@SLOW_QUERY_LOG=1 OR @@GENERAL_LOG=1),"
+            "/*M!100203 EXECUTE IMMEDIATE IF(@@LOG_OUTPUT='TABLE' AND (@@LOG_SLOW_QUERY=1 OR @@GENERAL_LOG=1),"
               "\"SET GLOBAL LOG_OUTPUT='NONE'\", \"DO 0\") */;\n");
 
   DBUG_RETURN(init_dumping_tables(qdatabase));

debian/additions/mariadb.conf.d/50-server.cnf

@@ -56,11 +56,11 @@ bind-address            = 127.0.0.1
 # Enable this if you want to have error logging into a separate file
 #log_error = /var/log/mysql/error.log
 # Enable the slow query log to see queries with especially long duration
-#slow_query_log_file    = /var/log/mysql/mariadb-slow.log
-#long_query_time        = 10
+#log_slow_query_file    = /var/log/mysql/mariadb-slow.log
+#log_slow_query_time    = 10
 #log_slow_verbosity     = query_plan,explain
 #log-queries-not-using-indexes
-#min_examined_row_limit = 1000
+#log_slow_min_examined_row_limit = 1000
 
 # The following can be used as easy to replay backup logs or for replication.
 # note: if you are setting up a replication slave, see README.Debian about

man/mysqladmin.1

@@ -676,7 +676,7 @@ The number of questions (queries) from clients since the server was started\&.
 Slow queries
 .sp
 The number of queries that have taken more than
-long_query_time
+log_slow_query_time
 seconds\&.
 .RE
 .sp

man/mysqlbinlog.1

@@ -1381,7 +1381,7 @@ The hex output consists of comment lines beginning with
 .RS 4
 .\}
 .nf
-/*!40019 SET @@session\&.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session\&.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 # at 4
 #051024 17:24:13 server id 1  end_log_pos 98

mysql-test/main/mysqlbinlog-innodb.result

@@ -20,7 +20,7 @@ a
 2
 FLUSH LOGS;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -51,7 +51,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/main/mysqlbinlog.result

@@ -15,7 +15,7 @@ flush logs;
 
 --- Local --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -94,7 +94,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- Broken LOAD DATA --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 START TRANSACTION
@@ -130,7 +130,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- --database --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -181,7 +181,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- --start-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 START TRANSACTION
@@ -209,7 +209,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- Remote --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -288,7 +288,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- Broken LOAD DATA --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 START TRANSACTION
@@ -324,7 +324,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- --database --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -375,7 +375,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- --start-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 START TRANSACTION
@@ -403,7 +403,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- reading stdin --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -424,7 +424,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 SET TIMESTAMP=1108844556/*!*/;
@@ -486,7 +486,7 @@ drop procedure p1;
 call p1();
 ERROR 42000: PROCEDURE test.p1 does not exist
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 use `test`/*!*/;
@@ -538,7 +538,7 @@ D0AA
 drop table t1;
 flush logs;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 use `test`/*!*/;
@@ -717,7 +717,7 @@ FLUSH LOGS;
 #
 # Test if the 'BEGIN', 'ROLLBACK' and 'COMMIT' are output if the database specified exists
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -772,7 +772,7 @@ ROLLBACK /* added by mysqlbinlog */;
 #
 # Test if the 'BEGIN', 'ROLLBACK' and 'COMMIT' are output if the database specified does not exist
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -808,7 +808,7 @@ ROLLBACK /* added by mysqlbinlog */;
 #
 # Test if the 'SAVEPOINT', 'ROLLBACK TO' are output if the database specified exists
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 SET TIMESTAMP=1266652094/*!*/;
@@ -850,7 +850,7 @@ ROLLBACK /* added by mysqlbinlog */;
 #
 # Test if the 'SAVEPOINT', 'ROLLBACK TO' are output if the database specified does not exist
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 SET TIMESTAMP=1266652094/*!*/;
@@ -936,7 +936,7 @@ SET GLOBAL SERVER_ID = 1;
 # FDE corrupted in relay log
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at 4
@@ -1019,7 +1019,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at 4
@@ -1102,7 +1102,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at 4
@@ -1185,7 +1185,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at 4

mysql-test/main/mysqlbinlog_row_compressed.result

@@ -12,7 +12,7 @@ DELETE FROM t1;
 DELETE FROM t2;
 FLUSH BINARY LOGS;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at 4

mysql-test/main/mysqlbinlog_row_minimal.result

@@ -10,7 +10,7 @@ DELETE FROM t1;
 DELETE FROM t2;
 FLUSH BINARY LOGS;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at 4
@@ -366,7 +366,7 @@ SET t1.is_deleted = TRUE
 WHERE t1.id = 1;
 FLUSH BINARY LOGS;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at POS

mysql-test/main/mysqlbinlog_stmt_compressed.result

@@ -12,7 +12,7 @@ DELETE FROM t1;
 DELETE FROM t2;
 FLUSH BINARY LOGS;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at 4

mysql-test/main/openssl_1.result

@@ -199,7 +199,7 @@ DROP USER bug42158@localhost;
 set global sql_mode=default;
 End of 5.1 tests
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ERROR: Failed on connect: TLS/SSL error
\ No newline at end of file

mysql-test/main/user_var-binlog.result

@@ -19,7 +19,7 @@ master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (@var1),(@var2)
 master-bin.000001	#	Query	#	#	COMMIT
 flush logs;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/binlog/include/ctype_ucs_binlog.result

-SET TIMESTAMP=10000;
-create table t2 (c char(30)) charset=ucs2;
-set @v=convert('abc' using ucs2);
-reset master;
-insert into t2 values (@v);
-include/show_binlog_events.inc
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
-master-bin.000001	#	User var	#	#	@`v`=_ucs2 X'006100620063' COLLATE ucs2_general_ci
-master-bin.000001	#	Query	#	#	use `test`; insert into t2 values (@v)
-master-bin.000001	#	Query	#	#	COMMIT
-flush logs;
-/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
-DELIMITER /*!*/;
-ROLLBACK/*!*/;
-BEGIN
-/*!*/;
-SET @`v`:=_ucs2 X'006100620063' COLLATE `ucs2_general_ci`/*!*/;
-use `test`/*!*/;
-SET TIMESTAMP=10000/*!*/;
-SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1/*!*/;
-SET @@session.sql_mode=1342177280/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
-insert into t2 values (@v)
-/*!*/;
-SET TIMESTAMP=10000/*!*/;
-COMMIT
-/*!*/;
-DELIMITER ;
-# End of log file
-ROLLBACK /* added by mysqlbinlog */;
-/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
-/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
-drop table t2;
-#
-# Start of 10.2 tests
-#
-#
-# MDEV-10866 Extend PREPARE and EXECUTE IMMEDIATE to understand expressions
-#
-FLUSH LOGS;
-SET NAMES utf8;
-CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8);
-EXECUTE IMMEDIATE 'INSERT INTO t1 VALUES (''ä(i1)'')';
-EXECUTE IMMEDIATE CONVERT('INSERT INTO t1 VALUES (''ä(i2)'')' USING ucs2);
-SET @stmt=CONVERT('INSERT INTO t1 VALUES (''ä(i3)'')' USING ucs2);
-EXECUTE IMMEDIATE @stmt;
-PREPARE stmt FROM 'INSERT INTO t1 VALUES (''ä(p1)'')';
-EXECUTE stmt;
-PREPARE stmt FROM CONVERT('INSERT INTO t1 VALUES (''ä(p2)'')' USING ucs2);
-EXECUTE stmt;
-SET @stmt=CONVERT('INSERT INTO t1 VALUES (''ä(p3)'')' USING ucs2);
-PREPARE stmt FROM @stmt;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-SELECT * FROM t1;
-a
-ä(i1)
-ä(i2)
-ä(i3)
-ä(p1)
-ä(p2)
-ä(p3)
-DROP TABLE t1;
-FLUSH LOGS;
-/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
-DELIMITER /*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Start: binlog v 4, server v #.##.## created 700101  6:46:40
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Gtid list [#-#-#]
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000002
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Binlog checkpoint master-bin.000003
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl
-/*!100101 SET @@session.skip_parallel_replication=0*//*!*/;
-/*!100001 SET @@session.gtid_domain_id=#*//*!*/;
-/*!100001 SET @@session.server_id=#*//*!*/;
-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-use `test`/*!*/;
-SET TIMESTAMP=10000/*!*/;
-SET @@session.pseudo_thread_id=#/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1/*!*/;
-SET @@session.sql_mode=1342177280/*!*/;
-SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
-/*!\C utf8 *//*!*/;
-SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
-SET @@session.lc_time_names=0/*!*/;
-SET @@session.collation_database=DEFAULT/*!*/;
-CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf8)
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
-BEGIN
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-INSERT INTO t1 VALUES ('ä(i1)')
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-COMMIT
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
-BEGIN
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-INSERT INTO t1 VALUES ('ä(i2)')
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-COMMIT
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
-BEGIN
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-INSERT INTO t1 VALUES ('ä(i3)')
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-COMMIT
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
-BEGIN
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-INSERT INTO t1 VALUES ('ä(p1)')
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-COMMIT
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
-BEGIN
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-INSERT INTO t1 VALUES ('ä(p2)')
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-COMMIT
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	GTID #-#-#
-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
-BEGIN
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-INSERT INTO t1 VALUES ('ä(p3)')
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-COMMIT
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	GTID #-#-# ddl
-/*!100001 SET @@session.gtid_seq_no=#*//*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Query	thread_id=#	exec_time=#	error_code=0
-SET TIMESTAMP=10000/*!*/;
-DROP TABLE `t1` /* generated by server */
-/*!*/;
-# at #
-#700101  6:46:40 server id #  end_log_pos # CRC32 XXX 	Rotate to master-bin.000004  pos: 4
-DELIMITER ;
-# End of log file
-ROLLBACK /* added by mysqlbinlog */;
-/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
-/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
-#
-# End of 10.2 tests
-#

mysql-test/suite/binlog/r/binlog_base64_flag.result

@@ -51,7 +51,7 @@ SELECT @binlog_fragment_0, @binlog_fragment_1 as 'NULL','NULL';
 NULL	NULL	NULL
 ==== Test --base64-output=never on a binlog with row events ====
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 <#>

mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result

@@ -18,7 +18,7 @@ insert into t1 values(null, "f");
 
 --- Local --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -87,7 +87,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- offset --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -153,7 +153,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -201,7 +201,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- stop-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -243,7 +243,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start and stop positions ---
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -270,7 +270,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start-datetime --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -318,7 +318,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- stop-datetime --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -361,7 +361,7 @@ ROLLBACK /* added by mysqlbinlog */;
 --- Local with 2 binlogs on command line --
 flush logs;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -450,7 +450,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- offset --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -536,7 +536,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -604,7 +604,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- stop-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -677,7 +677,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start-datetime --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -745,7 +745,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- stop-datetime --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -787,7 +787,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- Remote --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -856,7 +856,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- offset --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -922,7 +922,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 START TRANSACTION
@@ -969,7 +969,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- stop-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -1011,7 +1011,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start and stop positions ---
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 START TRANSACTION
@@ -1037,7 +1037,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start-datetime --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -1085,7 +1085,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- stop-datetime --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -1127,7 +1127,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- Remote with 2 binlogs on command line --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -1216,7 +1216,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- offset --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -1302,7 +1302,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 START TRANSACTION
@@ -1369,7 +1369,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- stop-position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -1440,7 +1440,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- start-datetime --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -1508,7 +1508,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- stop-datetime --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -1550,7 +1550,7 @@ ROLLBACK /* added by mysqlbinlog */;
 
 --- to-last-log --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result

@@ -355,7 +355,7 @@ INSERT INTO t1 VALUES (POINT(10,10));
 DROP TABLE t1;
 FLUSH LOGS;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -5335,7 +5335,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -5364,7 +5364,7 @@ START TRANSACTION
 
 Error: Found Old DECIMAL (mysql-4.1 or earlier). Not enough metadata to display the value.
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result

@@ -2249,7 +2249,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -5258,7 +5258,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -5658,7 +5658,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -6296,7 +6296,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result

@@ -2247,7 +2247,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -5279,7 +5279,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -5685,7 +5685,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -6333,7 +6333,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result

@@ -125,7 +125,7 @@ FLUSH LOGS;
 # Call mysqlbinlog to display the log file contents.
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/binlog/r/binlog_row_annotate.result

@@ -96,7 +96,7 @@ master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
 # - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map)
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -334,7 +334,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # - DELETE test1.t1, test2.t2 FROM <...>
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -493,7 +493,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # No Annotates should appear in this output
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -719,7 +719,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map)
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -957,7 +957,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # - DELETE test1.t1, test2.t2 FROM <...>
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -1116,7 +1116,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # No Annotates should appear in this output
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result

@@ -12,7 +12,7 @@ master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 flush logs;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -70,7 +70,7 @@ a
 DROP TABLE t1;
 FLUSH LOGS;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result

@@ -29,7 +29,7 @@ flush logs;
 # --rewrite-db = test3->new_test3
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -270,7 +270,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # --read-from-remote-server
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result

@@ -11,7 +11,7 @@ master-bin.000001	#	Query	#	#	use `test`; insert into t2 values (@v)
 master-bin.000001	#	Query	#	#	COMMIT
 flush logs;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -72,7 +72,7 @@ a
 DROP TABLE t1;
 FLUSH LOGS;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result

@@ -63,7 +63,7 @@ disconnect con1;
 #
 Proof of the truncated binlog file is readable (two transactions must be seen):
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 START TRANSACTION

mysql-test/suite/binlog/r/flashback.result

@@ -39,7 +39,7 @@ FLUSH LOGS;
 # Show mysqlbinlog result without -B
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -267,7 +267,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # Show mysqlbinlog result with -B
 #
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 #010909  9:46:40 server id 1  end_log_pos # CRC32 XXX 	Start: binlog v 4, server v #.##.## created 010909  9:46:40 at startup

mysql-test/suite/binlog_encryption/binlog_row_annotate.result

@@ -97,7 +97,7 @@ master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=POS
 # - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map)
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -338,7 +338,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # - DELETE test1.t1, test2.t2 FROM <...>
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #
@@ -500,7 +500,7 @@ ROLLBACK /* added by mysqlbinlog */;
 # No Annotates should appear in this output
 #####################################################################################
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/engines/funcs/r/rpl_sp.result

@@ -765,7 +765,7 @@ test	mysqltestbug36570_f1	FUNCTION	root@localhost	t	t	DEFINER		latin1	latin1_swe
 connection master;
 flush logs;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/galera/r/galera_gra_log.result

@@ -10,7 +10,7 @@ connection node_1;
 CREATE TABLE t1 (f1 INTEGER);
 connection node_2;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result

@@ -179,7 +179,7 @@ slave-bin.000001	#	Gtid	1	#	GTID 0-1-16
 slave-bin.000001	#	Query	1	#	use `test`; DROP TABLE IF EXISTS `t1`,`t2` /* generated by server */
 slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 # at #

mysql-test/suite/rpl/r/rpl_bug31076.result

@@ -36,7 +36,7 @@ KEY `visit_id` (`visit_id`),
 KEY `data` (`data`)
 ) ENGINE=MyISAM AUTO_INCREMENT=33900731 DEFAULT CHARSET=latin1;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 BINLOG '
 O1ZVRw8BAAAAZgAAAGoAAAAAAAQANS4xLjIzLXJjLWRlYnVnLWxvZwAAAAAAAAAAAAAAAAAAAAAA

mysql-test/suite/rpl/r/rpl_hrtime.result

@@ -30,7 +30,7 @@ connection master;
 drop table t1;
 include/rpl_end.inc
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/rpl/r/rpl_mdev382.result

@@ -172,7 +172,7 @@ master-bin.000001	#	Begin_load_query	1	#	;file_id=#;block_len=14
 master-bin.000001	#	Execute_load_query	1	#	use `test`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/f\'le.txt' INTO TABLE `db1``; select 'oops!'`.`t``1` FIELDS TERMINATED BY ',' ENCLOSED BY '\'' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a``1`, `b``2`) SET `c``3`= concat('|', "b""a'z", "!") ;file_id=#
 master-bin.000001	#	Query	1	#	COMMIT
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -272,7 +272,7 @@ master-bin.000001	#	User var	1	#	@```d```=_latin1 X'7878787878787878787878787878
 master-bin.000001	#	Query	1	#	use `db1``; select 'oops!'`; INSERT INTO t1 VALUES (@`a``1`+1, @`a``2`*100, @`a``3`-1, @`a``4`-1, @`b```/2, @```c`, substr(@```d```, 2, 98))
 master-bin.000001	#	Query	1	#	COMMIT
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -379,7 +379,7 @@ master-bin.000002	#	Gtid	1	#	BEGIN GTID #-#-#
 master-bin.000002	#	Query	1	#	use `test`; INSERT INTO t1 VALUES(1)
 master-bin.000002	#	Query	1	#	COMMIT
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/rpl/r/rpl_old_master_29078.result

@@ -9,7 +9,7 @@ connection master;
 flush binary logs;
 create table t2 (a timestamp);
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/rpl/r/rpl_parallel_29322.result

@@ -35,7 +35,7 @@ flush binary logs;
 flush binary logs;
 insert into t2 values (null, 2);
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -130,7 +130,7 @@ flush binary logs;
 flush binary logs;
 insert into t2 values (null, 2);
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result

@@ -161,7 +161,7 @@ c1	c3	c4	c5
 connection master;
 --- Test 2 position test --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -184,7 +184,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- Test 3 First Remote test --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -289,7 +289,7 @@ c1	c3	c4	c5
 connection master;
 --- Test 5 LOAD DATA --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 DELIMITER ;
@@ -299,7 +299,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- Test 6 reading stdin --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -328,7 +328,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- Test 7 reading stdin w/position --
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/rpl/r/rpl_sp.result

@@ -778,7 +778,7 @@ test	mysqltestbug36570_f1	FUNCTION	root@localhost	t	t	DEFINER		latin1	latin1_swe
 connection master;
 flush logs;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/rpl/r/rpl_timestamp.result

@@ -21,7 +21,7 @@ connection master;
 drop table t1;
 flush binary logs;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;

mysql-test/suite/rpl/t/rpl_bug31076.test

@@ -46,7 +46,7 @@ CREATE TABLE `visits_events` (
 ) ENGINE=MyISAM AUTO_INCREMENT=33900731 DEFAULT CHARSET=latin1;
 
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 --delimiter /*!*/;
 

mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result

-SET @start_global_value = @@global.max_insert_delayed_threads;
-SELECT @start_global_value;
-@start_global_value
-20
-SET @start_session_value = @@session.max_insert_delayed_threads;
-SELECT @start_session_value;
-@start_session_value
-20
-'#--------------------FN_DYNVARS_075_01-------------------------#'
-SET @@global.max_insert_delayed_threads = 1000;
-SET @@global.max_insert_delayed_threads = DEFAULT;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-20
-SET @@session.max_insert_delayed_threads = 1000;
-ERROR 42000: Variable 'max_insert_delayed_threads' can't be set to the value of '1000'
-SET @@session.max_insert_delayed_threads = DEFAULT;
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-20
-'#--------------------FN_DYNVARS_075_02-------------------------#'
-SET @@global.max_insert_delayed_threads = DEFAULT;
-SELECT @@global.max_insert_delayed_threads = 20;
-@@global.max_insert_delayed_threads = 20
-1
-SET @@session.max_insert_delayed_threads = DEFAULT;
-SELECT @@session.max_insert_delayed_threads = 20;
-@@session.max_insert_delayed_threads = 20
-1
-'#--------------------FN_DYNVARS_075_03-------------------------#'
-SET @@global.max_insert_delayed_threads = 1;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-1
-SET @@global.max_insert_delayed_threads = 1025;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-1025
-SET @@global.max_insert_delayed_threads = 0;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-0
-SET @@global.max_insert_delayed_threads = 16384;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-16384
-SET @@global.max_insert_delayed_threads = 16383;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-16383
-'#--------------------FN_DYNVARS_075_04-------------------------#'
-SET @@session.max_insert_delayed_threads = 1;
-ERROR 42000: Variable 'max_insert_delayed_threads' can't be set to the value of '1'
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-20
-SET @@session.max_insert_delayed_threads = 1025;
-ERROR 42000: Variable 'max_insert_delayed_threads' can't be set to the value of '1025'
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-20
-SET @@session.max_insert_delayed_threads = 0;
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-0
-SET @@session.max_insert_delayed_threads = 16384;
-ERROR 42000: Variable 'max_insert_delayed_threads' can't be set to the value of '16384'
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-0
-SET @@session.max_insert_delayed_threads = 16383;
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-16383
-'#------------------FN_DYNVARS_075_05-----------------------#'
-SET @@global.max_insert_delayed_threads = -1024;
-Warnings:
-Warning	1292	Truncated incorrect max_insert_delayed_threads value: '-1024'
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-0
-SET @@global.max_insert_delayed_threads = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_insert_delayed_threads value: '-1'
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-0
-SET @@global.max_insert_delayed_threads = 16385;
-Warnings:
-Warning	1292	Truncated incorrect max_insert_delayed_threads value: '16385'
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-16384
-SET @@global.max_insert_delayed_threads = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_insert_delayed_threads'
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-16384
-SET @@global.max_insert_delayed_threads = test;
-ERROR 42000: Incorrect argument type to variable 'max_insert_delayed_threads'
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-16384
-SET @@session.max_insert_delayed_threads = 16385;
-Warnings:
-Warning	1292	Truncated incorrect max_insert_delayed_threads value: '16385'
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-16384
-SET @@session.max_insert_delayed_threads = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_insert_delayed_threads value: '-1'
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-0
-SET @@session.max_insert_delayed_threads = -2;
-Warnings:
-Warning	1292	Truncated incorrect max_insert_delayed_threads value: '-2'
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-0
-SET @@session.max_insert_delayed_threads = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'max_insert_delayed_threads'
-SET @@session.max_insert_delayed_threads = 10737418241;
-Warnings:
-Warning	1292	Truncated incorrect max_insert_delayed_threads value: '10737418241'
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-16384
-SET @@session.max_insert_delayed_threads = test;
-ERROR 42000: Incorrect argument type to variable 'max_insert_delayed_threads'
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-16384
-'#------------------FN_DYNVARS_075_06-----------------------#'
-SELECT @@global.max_insert_delayed_threads = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='max_insert_delayed_threads';
-@@global.max_insert_delayed_threads = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_075_07-----------------------#'
-SELECT @@session.max_insert_delayed_threads = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='max_insert_delayed_threads';
-@@session.max_insert_delayed_threads = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_075_08-----------------------#'
-SET @@global.max_insert_delayed_threads = TRUE;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-1
-SET @@global.max_insert_delayed_threads = FALSE;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-0
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.max_insert_delayed_threads = 2048;
-SELECT @@max_insert_delayed_threads = @@global.max_insert_delayed_threads;
-@@max_insert_delayed_threads = @@global.max_insert_delayed_threads
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@max_insert_delayed_threads = 100000;
-ERROR 42000: Variable 'max_insert_delayed_threads' can't be set to the value of '100000'
-SELECT @@max_insert_delayed_threads = @@local.max_insert_delayed_threads;
-@@max_insert_delayed_threads = @@local.max_insert_delayed_threads
-1
-SELECT @@local.max_insert_delayed_threads = @@session.max_insert_delayed_threads;
-@@local.max_insert_delayed_threads = @@session.max_insert_delayed_threads
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET max_insert_delayed_threads = 1024;
-ERROR 42000: Variable 'max_insert_delayed_threads' can't be set to the value of '1024'
-SELECT @@max_insert_delayed_threads;
-@@max_insert_delayed_threads
-16384
-SELECT local.max_insert_delayed_threads;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.max_insert_delayed_threads;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT max_insert_delayed_threads = @@session.max_insert_delayed_threads;
-ERROR 42S22: Unknown column 'max_insert_delayed_threads' in 'field list'
-SET @@global.max_insert_delayed_threads = @start_global_value;
-SELECT @@global.max_insert_delayed_threads;
-@@global.max_insert_delayed_threads
-20
-SET @@session.max_insert_delayed_threads = @start_session_value;
-SELECT @@session.max_insert_delayed_threads;
-@@session.max_insert_delayed_threads
-20

scripts/mysql_system_tables_fix.sql

@@ -295,8 +295,8 @@ ALTER TABLE general_log
   MODIFY thread_id BIGINT(21) UNSIGNED NOT NULL;
 SET GLOBAL general_log = @old_log_state;
 
-SET @old_log_state = @@global.slow_query_log;
-SET GLOBAL slow_query_log = 'OFF';
+SET @old_log_state = @@global.log_slow_query;
+SET GLOBAL log_slow_query = 'OFF';
 ALTER TABLE slow_log
   ADD COLUMN thread_id BIGINT(21) UNSIGNED NOT NULL AFTER sql_text;
 ALTER TABLE slow_log
@@ -314,7 +314,7 @@ ALTER TABLE slow_log
   MODIFY server_id INTEGER UNSIGNED NOT NULL,
   MODIFY sql_text MEDIUMTEXT NOT NULL,
   MODIFY thread_id BIGINT(21) UNSIGNED NOT NULL;
-SET GLOBAL slow_query_log = @old_log_state;
+SET GLOBAL log_slow_query = @old_log_state;
 
 ALTER TABLE plugin
   MODIFY name varchar(64) COLLATE utf8_general_ci NOT NULL DEFAULT '',

scripts/sys_schema/procedures/ps_trace_thread.sql

@@ -151,7 +151,7 @@ BEGIN
                                        ELSE
                                          -- Use long query time from the server to
                                          -- flag long running statements in red
-                                         IF((timer_wait/1000000000000) > @@long_query_time, 
+                                         IF((timer_wait/1000000000000) > @@log_slow_query_time,
                                             ' style=filled, color=red', 
                                             ' style=filled, color=lightblue')
                                   END

scripts/sys_schema/procedures/ps_trace_thread_57.sql

@@ -154,7 +154,7 @@ BEGIN
                                        ELSE
                                          -- Use long query time from the server to
                                          -- flag long running statements in red
-                                         IF((timer_wait/1000000000000) > @@long_query_time, 
+                                         IF((timer_wait/1000000000000) > @@log_slow_query_time,
                                             ' style=filled, color=red', 
                                             ' style=filled, color=lightblue')
                                   END

scripts/wsrep_sst_mysqldump.sh

@@ -150,13 +150,13 @@ then
     # reason is that dump contains ALTER TABLE for log tables, and
     # this causes an error if logging is enabled
     GENERAL_LOG_OPT=$($MYSQL --skip-column-names -e "$STOP_WSREP SELECT @@GENERAL_LOG")
-    SLOW_LOG_OPT=$($MYSQL --skip-column-names -e "$STOP_WSREP SELECT @@SLOW_QUERY_LOG")
+    SLOW_LOG_OPT=$($MYSQL --skip-column-names -e "$STOP_WSREP SELECT @@LOG_SLOW_QUERY")
 
-    LOG_OFF="SET GLOBAL GENERAL_LOG=OFF; SET GLOBAL SLOW_QUERY_LOG=OFF;"
+    LOG_OFF="SET GLOBAL GENERAL_LOG=OFF; SET GLOBAL LOG_SLOW_QUERY=OFF;"
 
     # commands to restore log settings
     RESTORE_GENERAL_LOG="SET GLOBAL GENERAL_LOG=$GENERAL_LOG_OPT;"
-    RESTORE_SLOW_QUERY_LOG="SET GLOBAL SLOW_QUERY_LOG=$SLOW_LOG_OPT;"
+    RESTORE_SLOW_QUERY_LOG="SET GLOBAL LOG_SLOW_QUERY=$SLOW_LOG_OPT;"
 
     (echo "$STOP_WSREP" && echo "$LOG_OFF" && echo "$RESET_MASTER" && \
      echo "$SET_GTID_BINLOG_STATE" && echo "$SQL_LOG_BIN_OFF" && \

storage/rocksdb/mysql-test/rocksdb/r/mysqlbinlog_gtid_skip_empty_trans_rocksdb.result

@@ -39,7 +39,7 @@ commit;
 FLUSH LOGS;
 ==== Output of mysqlbinlog with --short-form --skip-empty-trans, --database and --skip-gtids options ====
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
@@ -90,7 +90,7 @@ FLUSH LOGS;
 ==== Output of mysqlbinlog with --short-form --skip-empty-trans, --database and --skip-gtids options ====
 ==== DB changed in the middle of the transaction, which belongs to the selected database
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 SET TIMESTAMP=1000000000/*!*/;
@@ -121,7 +121,7 @@ FLUSH LOGS;
 ==== Output of mysqlbinlog with --short-form --skip-empty-trans, --database and --skip-gtids options ====
 ==== DB changed in the middle of the transaction, which belongs to the non-selected database
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
+/*!40019 SET @@session.max_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 DELIMITER ;