Skip to content

Commit 2055b08

Browse files
author
Luis Soares
committed
WL#13964: Deprecate binlog_transaction_dependency_tracking
This patch deprecates binlog_transaction_dependency_tracking. Deprecation warnings are emitted when the option is used. Change-Id: Ia964a91791eb2b607e84a274e0a0bdb777f7e8c8
1 parent 135431f commit 2055b08

File tree

66 files changed

+616
-10
lines changed

Some content is hidden

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

66 files changed

+616
-10
lines changed

‎mysql-test/include/have_binlog_transaction_dependency_tracking_commit_order.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--source include/have_log_bin.inc
22

3+
--disable_warnings
34
let $have_binlog_transaction_dependency_tracking= `SELECT @@binlog_transaction_dependency_tracking LIKE 'COMMIT_ORDER'`;
5+
--enable_warnings
46
if (!$have_binlog_transaction_dependency_tracking)
57
{
68
--skip Test requires binlog_transaction_dependency_tracking = COMMIT_ORDER

‎mysql-test/suite/binlog/r/binlog_reset_connection_not_reset_writeset.result

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET';
2+
Warnings:
3+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
24
CREATE TABLE t1(id INT, PRIMARY KEY (id));
35
FLUSH LOGS;
46
INSERT INTO t1(id) VALUES(1);
57
INSERT INTO t1(id) VALUES(2);
68
SET GLOBAL binlog_transaction_dependency_tracking= 'WRITESET_SESSION';
9+
Warnings:
10+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
711
INSERT INTO t1(id) VALUES(3);
812
INSERT INTO t1(id) VALUES(4);
913
include/save_binlog_position.inc
1014
INSERT INTO t1(id) VALUES(5);
1115
include/include/assert_logical_timestamps.inc [2 5]
1216
SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
17+
Warnings:
18+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
1319
DROP TABLE t1;

‎mysql-test/suite/binlog/r/binlog_transaction_dependency_tracking_on_start.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,11 @@ include/assert.inc [binlog_transaction_dependency_tracking should be WRITESET]
5151
include/assert.inc [transaction_write_set_extraction should be XXHASH64]
5252
include/assert.inc [binlog_transaction_dependency_tracking should be WRITESET_SESSION]
5353
SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
54+
Warnings:
55+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
5456
SET GLOBAL transaction_write_set_extraction= SAVED_TWSE;
5557
Warnings:
5658
Warning 1287 '@@transaction_write_set_extraction' is deprecated and will be removed in a future release.
5759
SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
60+
Warnings:
61+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.

‎mysql-test/suite/binlog_nogtid/r/binlog_persist_only_variables.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ SET PERSIST_ONLY binlog_transaction_compression = @@GLOBAL.binlog_transaction_co
8080
SET PERSIST_ONLY binlog_transaction_compression_level_zstd = @@GLOBAL.binlog_transaction_compression_level_zstd;
8181
SET PERSIST_ONLY binlog_transaction_dependency_history_size = @@GLOBAL.binlog_transaction_dependency_history_size;
8282
SET PERSIST_ONLY binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
83+
Warnings:
84+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
85+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
8386
SET PERSIST_ONLY enforce_gtid_consistency = @@GLOBAL.enforce_gtid_consistency;
8487
SET PERSIST_ONLY group_replication_consistency = @@GLOBAL.group_replication_consistency;
8588
SET PERSIST_ONLY gtid_executed = @@GLOBAL.gtid_executed;

‎mysql-test/suite/binlog_nogtid/r/binlog_persist_variables.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ SET PERSIST binlog_transaction_compression = @@GLOBAL.binlog_transaction_compres
6262
SET PERSIST binlog_transaction_compression_level_zstd = @@GLOBAL.binlog_transaction_compression_level_zstd;
6363
SET PERSIST binlog_transaction_dependency_history_size = @@GLOBAL.binlog_transaction_dependency_history_size;
6464
SET PERSIST binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
65+
Warnings:
66+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
67+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
6568
SET PERSIST enforce_gtid_consistency = @@GLOBAL.enforce_gtid_consistency;
6669
SET PERSIST group_replication_consistency = @@GLOBAL.group_replication_consistency;
6770
SET PERSIST gtid_executed = @@GLOBAL.gtid_executed;

‎mysql-test/suite/group_replication/r/gr_startup_verifications.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ SET GLOBAL binlog_format= "ROW";
1111
Warnings:
1212
Warning 1287 '@@binlog_format' is deprecated and will be removed in a future release.
1313
SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
14+
Warnings:
15+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
1416
SET GLOBAL transaction_write_set_extraction=OFF;
1517
Warnings:
1618
Warning 1287 '@@transaction_write_set_extraction' is deprecated and will be removed in a future release.
@@ -20,6 +22,8 @@ SET GLOBAL transaction_write_set_extraction= WRITE_SET_EXTRACTION_ALGORITHM;
2022
Warnings:
2123
Warning 1287 '@@transaction_write_set_extraction' is deprecated and will be removed in a future release.
2224
SET GLOBAL binlog_transaction_dependency_tracking= BINLOG_TRANSACTION_DEPENDENCY_TRACKING;
25+
Warnings:
26+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
2327
#
2428
# Test if parallel applier is enabled and that start
2529
# Group Replication will fail.

‎mysql-test/suite/group_replication/r/gr_write_set_extraction_algorithm.result

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,21 @@ Note #### Storing MySQL user name or password information in the connection meta
55
[connection server1]
66
[connection server2]
77
SET @binlog_transaction_dependency_tracking_save= @@GLOBAL.binlog_transaction_dependency_tracking;
8+
Warnings:
9+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
810
SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
11+
Warnings:
12+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
913
SET @transaction_write_set_extraction_save= @@GLOBAL.transaction_write_set_extraction;
1014
Warnings:
1115
Warning 1287 '@@transaction_write_set_extraction' is deprecated and will be removed in a future release.
1216
[connection server1]
1317
SET @binlog_transaction_dependency_tracking_save= @@GLOBAL.binlog_transaction_dependency_tracking;
18+
Warnings:
19+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
1420
SET GLOBAL binlog_transaction_dependency_tracking= COMMIT_ORDER;
21+
Warnings:
22+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
1523
SET @transaction_write_set_extraction_save= @@GLOBAL.transaction_write_set_extraction;
1624
Warnings:
1725
Warning 1287 '@@transaction_write_set_extraction' is deprecated and will be removed in a future release.
@@ -51,9 +59,13 @@ SET GLOBAL transaction_write_set_extraction= @transaction_write_set_extraction_s
5159
Warnings:
5260
Warning 1287 '@@transaction_write_set_extraction' is deprecated and will be removed in a future release.
5361
SET GLOBAL binlog_transaction_dependency_tracking= @binlog_transaction_dependency_tracking_save;
62+
Warnings:
63+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
5464
[connection server2]
5565
SET GLOBAL transaction_write_set_extraction= @transaction_write_set_extraction_save;
5666
Warnings:
5767
Warning 1287 '@@transaction_write_set_extraction' is deprecated and will be removed in a future release.
5868
SET GLOBAL binlog_transaction_dependency_tracking= @binlog_transaction_dependency_tracking_save;
69+
Warnings:
70+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
5971
include/group_replication_end.inc

‎mysql-test/suite/ndb_binlog/r/log_trans_dependency_off.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ select @@global.ndb_log_transaction_dependency;
1313
select @@binlog_transaction_dependency_tracking;
1414
@@binlog_transaction_dependency_tracking
1515
COMMIT_ORDER
16+
Warnings:
17+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
1618
CREATE TABLE t1 (
1719
a INT PRIMARY KEY
1820
) engine=ndb;

‎mysql-test/suite/ndb_binlog/r/log_trans_dependency_on.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ ERROR HY000: Variable 'ndb_log_transaction_dependency' is a read only variable
1919
select @@binlog_transaction_dependency_tracking;
2020
@@binlog_transaction_dependency_tracking
2121
WRITESET
22+
Warnings:
23+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
2224
CREATE TABLE t1 (
2325
a INT PRIMARY KEY,
2426
b CHAR(10)

‎mysql-test/suite/ndb_rpl/r/log_transaction_dependency.result

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,12 @@ Warning 1287 '@@replica_parallel_type' is deprecated and will be removed in a fu
1818
SET GLOBAL replica_parallel_workers = 3;
1919
SET GLOBAL replica_transaction_retries = 0;
2020
SET @save_binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
21+
Warnings:
22+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
2123
SET @save_binlog_transaction_dependency_history_size = @@GLOBAL.binlog_transaction_dependency_history_size;
2224
SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
25+
Warnings:
26+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
2327
CREATE TABLE tests (`id` INT NOT NULL, `description` VARCHAR(50), `results` VARCHAR(100), PRIMARY KEY(`id`));
2428
INSERT INTO `tests` (`id`, `description`, `results`) VALUES
2529
(1, 'Writeset', '0 1;1 2;1 3;1 4;3 5;3 6;4 7;7 8;6 9;9 10'),
@@ -37,13 +41,17 @@ INSERT INTO `tests` (`id`, `description`, `results`) VALUES
3741
FLUSH LOGS;
3842
#### TEST ####
3943
SET GLOBAL binlog_transaction_dependency_tracking = WRITESET;
44+
Warnings:
45+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
4046
######## 1. WRITESET ########
4147
#### STEP 1.1 TEST Writeset ####
4248
SET GLOBAL binlog_transaction_dependency_history_size=25000;
4349
SELECT @@binlog_transaction_dependency_tracking,
4450
@@binlog_transaction_dependency_history_size;
4551
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
4652
WRITESET 25000
53+
Warnings:
54+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
4755
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
4856
PRIMARY KEY (`id`)) ENGINE=NDB;
4957
#TRX2 (session A, independent)
@@ -104,6 +112,8 @@ SELECT @@binlog_transaction_dependency_tracking,
104112
@@binlog_transaction_dependency_history_size;
105113
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
106114
WRITESET 25000
115+
Warnings:
116+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
107117
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
108118
PRIMARY KEY (`id`)) ENGINE=NDB;
109119
#TRX2 (session A, independent)
@@ -168,6 +178,8 @@ SELECT @@binlog_transaction_dependency_tracking,
168178
@@binlog_transaction_dependency_history_size;
169179
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
170180
WRITESET 25000
181+
Warnings:
182+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
171183
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
172184
PRIMARY KEY (`id`)) ENGINE=NDB;
173185
#TRX2 (session A, independent)
@@ -232,6 +244,8 @@ SELECT @@binlog_transaction_dependency_tracking,
232244
@@binlog_transaction_dependency_history_size;
233245
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
234246
WRITESET 5
247+
Warnings:
248+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
235249
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
236250
PRIMARY KEY (`id`)) ENGINE=NDB;
237251
#TRX2 (session A, independent)
@@ -287,13 +301,17 @@ Processing binlog master-bin.000006
287301
FLUSH LOGS;
288302
include/include/assert_logical_timestamps.inc [0 1;1 2;1 3;1 4;4 5;4 6;4 7;7 8;7 9;9 10]
289303
SET GLOBAL binlog_transaction_dependency_tracking = WRITESET_SESSION;
304+
Warnings:
305+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
290306
######## 2. WRITESET_SESSION ########
291307
#### STEP 2.1 TEST Writeset_session ####
292308
SET GLOBAL binlog_transaction_dependency_history_size=25000;
293309
SELECT @@binlog_transaction_dependency_tracking,
294310
@@binlog_transaction_dependency_history_size;
295311
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
296312
WRITESET_SESSION 25000
313+
Warnings:
314+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
297315
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
298316
PRIMARY KEY (`id`)) ENGINE=NDB;
299317
#TRX2 (session A, independent)
@@ -354,6 +372,8 @@ SELECT @@binlog_transaction_dependency_tracking,
354372
@@binlog_transaction_dependency_history_size;
355373
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
356374
WRITESET_SESSION 25000
375+
Warnings:
376+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
357377
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
358378
PRIMARY KEY (`id`)) ENGINE=NDB;
359379
#TRX2 (session A, independent)
@@ -418,6 +438,8 @@ SELECT @@binlog_transaction_dependency_tracking,
418438
@@binlog_transaction_dependency_history_size;
419439
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
420440
WRITESET_SESSION 25000
441+
Warnings:
442+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
421443
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
422444
PRIMARY KEY (`id`)) ENGINE=NDB;
423445
#TRX2 (session A, independent)
@@ -482,6 +504,8 @@ SELECT @@binlog_transaction_dependency_tracking,
482504
@@binlog_transaction_dependency_history_size;
483505
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
484506
WRITESET_SESSION 5
507+
Warnings:
508+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
485509
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
486510
PRIMARY KEY (`id`)) ENGINE=NDB;
487511
#TRX2 (session A, independent)
@@ -537,13 +561,17 @@ Processing binlog master-bin.000011
537561
FLUSH LOGS;
538562
include/include/assert_logical_timestamps.inc [0 1;1 2;2 3;3 4;4 5;5 6;6 7;7 8;8 9;9 10]
539563
SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
564+
Warnings:
565+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
540566
######## 3. COMMIT_ORDER ########
541567
#### STEP 3.1 TEST Commit_order ####
542568
SET GLOBAL binlog_transaction_dependency_history_size=25000;
543569
SELECT @@binlog_transaction_dependency_tracking,
544570
@@binlog_transaction_dependency_history_size;
545571
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
546572
COMMIT_ORDER 25000
573+
Warnings:
574+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
547575
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
548576
PRIMARY KEY (`id`)) ENGINE=NDB;
549577
#TRX2 (session A, independent)
@@ -604,6 +632,8 @@ SELECT @@binlog_transaction_dependency_tracking,
604632
@@binlog_transaction_dependency_history_size;
605633
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
606634
COMMIT_ORDER 25000
635+
Warnings:
636+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
607637
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
608638
PRIMARY KEY (`id`)) ENGINE=NDB;
609639
#TRX2 (session A, independent)
@@ -668,6 +698,8 @@ SELECT @@binlog_transaction_dependency_tracking,
668698
@@binlog_transaction_dependency_history_size;
669699
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
670700
COMMIT_ORDER 25000
701+
Warnings:
702+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
671703
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
672704
PRIMARY KEY (`id`)) ENGINE=NDB;
673705
#TRX2 (session A, independent)
@@ -732,6 +764,8 @@ SELECT @@binlog_transaction_dependency_tracking,
732764
@@binlog_transaction_dependency_history_size;
733765
@@binlog_transaction_dependency_tracking @@binlog_transaction_dependency_history_size
734766
COMMIT_ORDER 5
767+
Warnings:
768+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
735769
CREATE TABLE `t1` (`id` int NOT NULL, `val` int NOT NULL,
736770
PRIMARY KEY (`id`)) ENGINE=NDB;
737771
#TRX2 (session A, independent)
@@ -794,6 +828,8 @@ include/diff_tables.inc [master:test.tests, slave:test.tests]
794828
DROP TABLE `tests`;
795829
include/sync_slave_sql_with_master.inc
796830
SET GLOBAL binlog_transaction_dependency_tracking= WRITESET;
831+
Warnings:
832+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
797833
SET GLOBAL binlog_transaction_dependency_history_size= DEFAULT;
798834
FLUSH LOGS;
799835

@@ -804,6 +840,8 @@ INSERT INTO t1 VALUES (null);
804840
INSERT INTO t1 VALUES (null);
805841
# Wait for ndb_binlog thread...
806842
set global binlog_transaction_dependency_tracking=WRITESET;
843+
Warnings:
844+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
807845
INSERT INTO t1 VALUES (null);
808846
# Wait for ndb_binlog thread...
809847
INSERT INTO t1 VALUES (null);
@@ -818,6 +856,8 @@ INSERT INTO t1 VALUES (null);
818856
INSERT INTO t1 VALUES (null);
819857
# Wait for ndb_binlog thread...
820858
set global binlog_transaction_dependency_tracking=WRITESET;
859+
Warnings:
860+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
821861
INSERT INTO t1 VALUES (null);
822862
# Wait for ndb_binlog thread...
823863
INSERT INTO t1 VALUES (null);
@@ -907,6 +947,10 @@ SET @@GLOBAL.replica_parallel_workers= @save_replica_parallel_workers;
907947
SET @@GLOBAL.replica_transaction_retries= @save_replica_transaction_retries;
908948
include/start_slave.inc
909949
SET GLOBAL binlog_transaction_dependency_tracking = COMMIT_ORDER;
950+
Warnings:
951+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
910952
SET @@GLOBAL.binlog_transaction_dependency_tracking= @save_binlog_transaction_dependency_tracking;
953+
Warnings:
954+
Warning 1287 '@@binlog_transaction_dependency_tracking' is deprecated and will be removed in a future release.
911955
SET @@GLOBAL.binlog_transaction_dependency_history_size= @save_binlog_transaction_dependency_history_size;
912956
include/rpl_end.inc

0 commit comments

Comments
 (0)