Skip to content

Commit 8759967

Browse files
vuvovavuvova
committed
MDEV-29625 Some clients/scripts refer to old slow log variables
1 parent 05c1195 commit 8759967

Some content is hidden

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

45 files changed

+124
-747
lines changed

‎client/mysqlbinlog.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3690,7 +3690,7 @@ int main(int argc, char** argv)
36903690
fprintf(result_file, "/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;\n");
36913691

36923692
fprintf(result_file,
3693-
"/*!40019 SET @@session.max_insert_delayed_threads=0*/;\n");
3693+
"/*!40019 SET @@session.max_delayed_threads=0*/;\n");
36943694

36953695
if (disable_log_bin)
36963696
fprintf(result_file,

‎client/mysqldump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ static void write_header(FILE *sql_file, const char *db_name)
784784

785785
if (!opt_logging)
786786
fprintf(sql_file,
787-
"\n/*M!100101 SET LOCAL SQL_LOG_OFF=0, LOCAL SLOW_QUERY_LOG=0 */;");
787+
"\n/*M!100101 SET LOCAL SQL_LOG_OFF=0, LOCAL LOG_SLOW_QUERY=0 */;");
788788

789789
if (opt_set_charset)
790790
fprintf(sql_file,
@@ -5445,7 +5445,7 @@ static int init_dumping_mysql_tables(char *qdatabase)
54455445
if (opt_drop_database)
54465446
fprintf(md_result_file,
54475447
"\n/*!50106 SET @save_log_output=@@LOG_OUTPUT*/;\n"
5448-
"/*M!100203 EXECUTE IMMEDIATE IF(@@LOG_OUTPUT='TABLE' AND (@@SLOW_QUERY_LOG=1 OR @@GENERAL_LOG=1),"
5448+
"/*M!100203 EXECUTE IMMEDIATE IF(@@LOG_OUTPUT='TABLE' AND (@@LOG_SLOW_QUERY=1 OR @@GENERAL_LOG=1),"
54495449
"\"SET GLOBAL LOG_OUTPUT='NONE'\", \"DO 0\") */;\n");
54505450

54515451
DBUG_RETURN(init_dumping_tables(qdatabase));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ bind-address = 127.0.0.1
5656
# Enable this if you want to have error logging into a separate file
5757
#log_error = /var/log/mysql/error.log
5858
# Enable the slow query log to see queries with especially long duration
59-
#slow_query_log_file = /var/log/mysql/mariadb-slow.log
60-
#long_query_time = 10
59+
#log_slow_query_file = /var/log/mysql/mariadb-slow.log
60+
#log_slow_query_time = 10
6161
#log_slow_verbosity = query_plan,explain
6262
#log-queries-not-using-indexes
63-
#min_examined_row_limit = 1000
63+
#log_slow_min_examined_row_limit = 1000
6464

6565
# The following can be used as easy to replay backup logs or for replication.
6666
# note: if you are setting up a replication slave, see README.Debian about

‎man/mysqladmin.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ The number of questions (queries) from clients since the server was started\&.
676676
Slow queries
677677
.sp
678678
The number of queries that have taken more than
679-
long_query_time
679+
log_slow_query_time
680680
seconds\&.
681681
.RE
682682
.sp

‎man/mysqlbinlog.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@ The hex output consists of comment lines beginning with
13811381
.RS 4
13821382
.\}
13831383
.nf
1384-
/*!40019 SET @@session\&.max_insert_delayed_threads=0*/;
1384+
/*!40019 SET @@session\&.max_delayed_threads=0*/;
13851385
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
13861386
# at 4
13871387
#051024 17:24:13 server id 1 end_log_pos 98

‎mysql-test/main/mysqlbinlog-innodb.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ a
2020
2
2121
FLUSH LOGS;
2222
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
23-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
23+
/*!40019 SET @@session.max_delayed_threads=0*/;
2424
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2525
DELIMITER /*!*/;
2626
ROLLBACK/*!*/;
@@ -51,7 +51,7 @@ ROLLBACK /* added by mysqlbinlog */;
5151
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
5252
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
5353
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
54-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
54+
/*!40019 SET @@session.max_delayed_threads=0*/;
5555
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
5656
DELIMITER /*!*/;
5757
ROLLBACK/*!*/;

‎mysql-test/main/mysqlbinlog.result

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ flush logs;
1515

1616
--- Local --
1717
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
18-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
18+
/*!40019 SET @@session.max_delayed_threads=0*/;
1919
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2020
DELIMITER /*!*/;
2121
ROLLBACK/*!*/;
@@ -94,7 +94,7 @@ ROLLBACK /* added by mysqlbinlog */;
9494

9595
--- Broken LOAD DATA --
9696
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
97-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
97+
/*!40019 SET @@session.max_delayed_threads=0*/;
9898
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
9999
DELIMITER /*!*/;
100100
START TRANSACTION
@@ -130,7 +130,7 @@ ROLLBACK /* added by mysqlbinlog */;
130130

131131
--- --database --
132132
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
133-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
133+
/*!40019 SET @@session.max_delayed_threads=0*/;
134134
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
135135
DELIMITER /*!*/;
136136
ROLLBACK/*!*/;
@@ -181,7 +181,7 @@ ROLLBACK /* added by mysqlbinlog */;
181181

182182
--- --start-position --
183183
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
184-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
184+
/*!40019 SET @@session.max_delayed_threads=0*/;
185185
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
186186
DELIMITER /*!*/;
187187
START TRANSACTION
@@ -209,7 +209,7 @@ ROLLBACK /* added by mysqlbinlog */;
209209

210210
--- Remote --
211211
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
212-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
212+
/*!40019 SET @@session.max_delayed_threads=0*/;
213213
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
214214
DELIMITER /*!*/;
215215
ROLLBACK/*!*/;
@@ -288,7 +288,7 @@ ROLLBACK /* added by mysqlbinlog */;
288288

289289
--- Broken LOAD DATA --
290290
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
291-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
291+
/*!40019 SET @@session.max_delayed_threads=0*/;
292292
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
293293
DELIMITER /*!*/;
294294
START TRANSACTION
@@ -324,7 +324,7 @@ ROLLBACK /* added by mysqlbinlog */;
324324

325325
--- --database --
326326
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
327-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
327+
/*!40019 SET @@session.max_delayed_threads=0*/;
328328
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
329329
DELIMITER /*!*/;
330330
ROLLBACK/*!*/;
@@ -375,7 +375,7 @@ ROLLBACK /* added by mysqlbinlog */;
375375

376376
--- --start-position --
377377
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
378-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
378+
/*!40019 SET @@session.max_delayed_threads=0*/;
379379
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
380380
DELIMITER /*!*/;
381381
START TRANSACTION
@@ -403,7 +403,7 @@ ROLLBACK /* added by mysqlbinlog */;
403403

404404
--- reading stdin --
405405
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
406-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
406+
/*!40019 SET @@session.max_delayed_threads=0*/;
407407
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
408408
DELIMITER /*!*/;
409409
ROLLBACK/*!*/;
@@ -424,7 +424,7 @@ ROLLBACK /* added by mysqlbinlog */;
424424
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
425425
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
426426
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
427-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
427+
/*!40019 SET @@session.max_delayed_threads=0*/;
428428
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
429429
DELIMITER /*!*/;
430430
SET TIMESTAMP=1108844556/*!*/;
@@ -486,7 +486,7 @@ drop procedure p1;
486486
call p1();
487487
ERROR 42000: PROCEDURE test.p1 does not exist
488488
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
489-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
489+
/*!40019 SET @@session.max_delayed_threads=0*/;
490490
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
491491
DELIMITER /*!*/;
492492
use `test`/*!*/;
@@ -538,7 +538,7 @@ D0AA
538538
drop table t1;
539539
flush logs;
540540
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
541-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
541+
/*!40019 SET @@session.max_delayed_threads=0*/;
542542
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
543543
DELIMITER /*!*/;
544544
use `test`/*!*/;
@@ -717,7 +717,7 @@ FLUSH LOGS;
717717
#
718718
# Test if the 'BEGIN', 'ROLLBACK' and 'COMMIT' are output if the database specified exists
719719
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
720-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
720+
/*!40019 SET @@session.max_delayed_threads=0*/;
721721
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
722722
DELIMITER /*!*/;
723723
ROLLBACK/*!*/;
@@ -772,7 +772,7 @@ ROLLBACK /* added by mysqlbinlog */;
772772
#
773773
# Test if the 'BEGIN', 'ROLLBACK' and 'COMMIT' are output if the database specified does not exist
774774
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
775-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
775+
/*!40019 SET @@session.max_delayed_threads=0*/;
776776
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
777777
DELIMITER /*!*/;
778778
ROLLBACK/*!*/;
@@ -808,7 +808,7 @@ ROLLBACK /* added by mysqlbinlog */;
808808
#
809809
# Test if the 'SAVEPOINT', 'ROLLBACK TO' are output if the database specified exists
810810
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
811-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
811+
/*!40019 SET @@session.max_delayed_threads=0*/;
812812
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
813813
DELIMITER /*!*/;
814814
SET TIMESTAMP=1266652094/*!*/;
@@ -850,7 +850,7 @@ ROLLBACK /* added by mysqlbinlog */;
850850
#
851851
# Test if the 'SAVEPOINT', 'ROLLBACK TO' are output if the database specified does not exist
852852
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
853-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
853+
/*!40019 SET @@session.max_delayed_threads=0*/;
854854
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
855855
DELIMITER /*!*/;
856856
SET TIMESTAMP=1266652094/*!*/;
@@ -936,7 +936,7 @@ SET GLOBAL SERVER_ID = 1;
936936
# FDE corrupted in relay log
937937
#
938938
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
939-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
939+
/*!40019 SET @@session.max_delayed_threads=0*/;
940940
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
941941
DELIMITER /*!*/;
942942
# at 4
@@ -1019,7 +1019,7 @@ ROLLBACK /* added by mysqlbinlog */;
10191019
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
10201020
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
10211021
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1022-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
1022+
/*!40019 SET @@session.max_delayed_threads=0*/;
10231023
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
10241024
DELIMITER /*!*/;
10251025
# at 4
@@ -1102,7 +1102,7 @@ ROLLBACK /* added by mysqlbinlog */;
11021102
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
11031103
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
11041104
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1105-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
1105+
/*!40019 SET @@session.max_delayed_threads=0*/;
11061106
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
11071107
DELIMITER /*!*/;
11081108
# at 4
@@ -1185,7 +1185,7 @@ ROLLBACK /* added by mysqlbinlog */;
11851185
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
11861186
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
11871187
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
1188-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
1188+
/*!40019 SET @@session.max_delayed_threads=0*/;
11891189
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
11901190
DELIMITER /*!*/;
11911191
# at 4

‎mysql-test/main/mysqlbinlog_row_compressed.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DELETE FROM t1;
1212
DELETE FROM t2;
1313
FLUSH BINARY LOGS;
1414
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
15-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
15+
/*!40019 SET @@session.max_delayed_threads=0*/;
1616
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1717
DELIMITER /*!*/;
1818
# at 4

‎mysql-test/main/mysqlbinlog_row_minimal.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DELETE FROM t1;
1010
DELETE FROM t2;
1111
FLUSH BINARY LOGS;
1212
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
13-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
13+
/*!40019 SET @@session.max_delayed_threads=0*/;
1414
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1515
DELIMITER /*!*/;
1616
# at 4
@@ -366,7 +366,7 @@ SET t1.is_deleted = TRUE
366366
WHERE t1.id = 1;
367367
FLUSH BINARY LOGS;
368368
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
369-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
369+
/*!40019 SET @@session.max_delayed_threads=0*/;
370370
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
371371
DELIMITER /*!*/;
372372
# at POS

‎mysql-test/main/mysqlbinlog_stmt_compressed.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DELETE FROM t1;
1212
DELETE FROM t2;
1313
FLUSH BINARY LOGS;
1414
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
15-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
15+
/*!40019 SET @@session.max_delayed_threads=0*/;
1616
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
1717
DELIMITER /*!*/;
1818
# at 4

‎mysql-test/main/openssl_1.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ DROP USER bug42158@localhost;
199199
set global sql_mode=default;
200200
End of 5.1 tests
201201
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
202-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
202+
/*!40019 SET @@session.max_delayed_threads=0*/;
203203
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
204204
DELIMITER /*!*/;
205205
ERROR: Failed on connect: TLS/SSL error

‎mysql-test/main/user_var-binlog.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ master-bin.000001 # Query # # use `test`; insert into t1 values (@var1),(@var2)
1919
master-bin.000001 # Query # # COMMIT
2020
flush logs;
2121
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
22-
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
22+
/*!40019 SET @@session.max_delayed_threads=0*/;
2323
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
2424
DELIMITER /*!*/;
2525
ROLLBACK/*!*/;

0 commit comments

Comments
 (0)