Skip to content

Commit 4f0b693

Browse files
author
Hemant Dangi
committed
Revert "BUG#26985561: BACKPORT BUG#26277771 TO 5.7"
This reverts commit fce1c96b65005c78b3016e855a3e4790bd5c6449.
1 parent df1c4e0 commit 4f0b693

10 files changed

+148
-688
lines changed

‎mysql-test/suite/rpl/r/rpl_transaction_write_set_extraction.result

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Note #### Storing MySQL user name or password information in the master info rep
55
[connection master]
66
include/assert.inc [The value for transaction_write_set_extraction shoudl be MURMUR32]
77
CREATE TABLE t1 (a INT PRIMARY KEY);
8-
SET @debug_saved= @@GLOBAL.DEBUG;
8+
SET @@GLOBAL.DEBUG= @debug_saved;
99
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_insert';
1010
INSERT INTO t1 VALUES(1);
1111
SET @@GLOBAL.DEBUG= @debug_saved;
@@ -15,17 +15,6 @@ SET @@GLOBAL.DEBUG= @debug_saved;
1515
include/rpl_sync.inc
1616
DROP TABLE t1;
1717
include/rpl_sync.inc
18-
CREATE TABLE t1 (a BINARY(1) PRIMARY KEY);
19-
SET @@GLOBAL.DEBUG= @debug_saved;
20-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_insert_collation';
21-
INSERT INTO t1 VALUES(1);
22-
SET @@GLOBAL.DEBUG= @debug_saved;
23-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_update_collation';
24-
UPDATE t1 SET a=3 WHERE a=1;
25-
SET @@GLOBAL.DEBUG= @debug_saved;
26-
include/rpl_sync.inc
27-
DROP TABLE t1;
28-
include/rpl_sync.inc
2918
CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a, b));
3019
SET @@GLOBAL.DEBUG= @debug_saved;
3120
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_insert';
@@ -37,17 +26,6 @@ SET @@GLOBAL.DEBUG= @debug_saved;
3726
include/rpl_sync.inc
3827
DROP TABLE t1;
3928
include/rpl_sync.inc
40-
CREATE TABLE t1(a BINARY(1), b BINARY(1), PRIMARY KEY(a, b));
41-
SET @@GLOBAL.DEBUG= @debug_saved;
42-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_insert_collation';
43-
INSERT INTO t1 VALUE(1, 2);
44-
SET @@GLOBAL.DEBUG= @debug_saved;
45-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_update_collation';
46-
UPDATE t1 SET a=3 WHERE a=1;
47-
SET @@GLOBAL.DEBUG= @debug_saved;
48-
include/rpl_sync.inc
49-
DROP TABLE t1;
50-
include/rpl_sync.inc
5129
CREATE TABLE t1 (c1 INT PRIMARY KEY, c2 INT NOT NULL UNIQUE, c3 INT NOT NULL UNIQUE);
5230
SET @@GLOBAL.DEBUG= @debug_saved;
5331
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_insert';
@@ -58,16 +36,6 @@ UPDATE t1 SET c1=5 WHERE c1=1;
5836
include/rpl_sync.inc
5937
DROP TABLE t1;
6038
include/rpl_sync.inc
61-
CREATE TABLE t1 (c1 BINARY(1) PRIMARY KEY, c2 BINARY(1) NOT NULL UNIQUE, c3 BINARY(1) NOT NULL UNIQUE);
62-
SET @@GLOBAL.DEBUG= @debug_saved;
63-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_insert_collation';
64-
INSERT INTO t1 VALUES (1, 2, 3);
65-
SET @@GLOBAL.DEBUG= @debug_saved;
66-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_update_collation';
67-
UPDATE t1 SET c1=5 WHERE c1=1;
68-
include/rpl_sync.inc
69-
DROP TABLE t1;
70-
include/rpl_sync.inc
7139
CREATE TABLE t1 (a INT, d INT, b INT NOT NULL UNIQUE, c INT NOT NULL UNIQUE, PRIMARY KEY(a, d));
7240
SET @@GLOBAL.DEBUG= @debug_saved;
7341
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_insert';
@@ -79,17 +47,6 @@ SET @@GLOBAL.DEBUG= @debug_saved;
7947
include/rpl_sync.inc
8048
DROP TABLE t1;
8149
include/rpl_sync.inc
82-
CREATE TABLE t1 (a BINARY(1), d BINARY(1), b BINARY(1) NOT NULL UNIQUE, c BINARY(1) NOT NULL UNIQUE, PRIMARY KEY(a, d));
83-
SET @@GLOBAL.DEBUG= @debug_saved;
84-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_insert_collation';
85-
INSERT INTO t1 VALUES(1, 2, 3, 4);
86-
SET @@GLOBAL.DEBUG= @debug_saved;
87-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_update_collation';
88-
UPDATE t1 SET a=5 WHERE a=1;
89-
SET @@GLOBAL.DEBUG= @debug_saved;
90-
include/rpl_sync.inc
91-
DROP TABLE t1;
92-
include/rpl_sync.inc
9350
CREATE TABLE t1 (a INT PRIMARY KEY);
9451
CREATE TABLE t2 (b INT PRIMARY KEY);
9552
CREATE TABLE t3 (c1 INT, c2 INT NOT NULL UNIQUE, PRIMARY KEY(c1, c2), FOREIGN KEY(c1) REFERENCES t1(a), FOREIGN KEY(c2) REFERENCES t2(b));
@@ -109,23 +66,4 @@ DROP TABLE t3;
10966
DROP TABLE t2;
11067
DROP TABLE t1;
11168
include/rpl_sync.inc
112-
CREATE TABLE t1 (a BINARY(1) PRIMARY KEY);
113-
CREATE TABLE t2 (b BINARY(1) PRIMARY KEY);
114-
CREATE TABLE t3 (c1 BINARY(1), c2 BINARY(1) NOT NULL UNIQUE, PRIMARY KEY(c1, c2), FOREIGN KEY(c1) REFERENCES t1(a), FOREIGN KEY(c2) REFERENCES t2(b));
115-
INSERT INTO t1 VALUES (1);
116-
INSERT INTO t2 VALUES (5);
117-
SET @@GLOBAL.DEBUG= @debug_saved;
118-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_foreign_key_generated_insert_collation';
119-
INSERT INTO t3 values(1,5);
120-
SET @@GLOBAL.DEBUG= @debug_saved;
121-
INSERT INTO t1 VALUES (3);
122-
include/rpl_sync.inc
123-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_foreign_key_generated_update_collation';
124-
UPDATE t3 SET c1=3 WHERE c1=1;
125-
include/rpl_sync.inc
126-
SET @@GLOBAL.DEBUG= @debug_saved;
127-
DROP TABLE t3;
128-
DROP TABLE t2;
129-
DROP TABLE t1;
130-
include/rpl_sync.inc
13169
include/rpl_end.inc

‎mysql-test/suite/rpl/t/rpl_transaction_write_set_extraction.test

Lines changed: 1 addition & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
--connection master
1919
CREATE TABLE t1 (a INT PRIMARY KEY);
20-
SET @debug_saved= @@GLOBAL.DEBUG;
20+
SET @@GLOBAL.DEBUG= @debug_saved;
2121
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_insert';
2222
INSERT INTO t1 VALUES(1);
2323
SET @@GLOBAL.DEBUG= @debug_saved;
@@ -28,23 +28,8 @@ SET @@GLOBAL.DEBUG= @debug_saved;
2828
DROP TABLE t1;
2929
--source include/rpl_sync.inc
3030

31-
# tests both writeset algorithm (with and without collation)
32-
--connection master
33-
CREATE TABLE t1 (a BINARY(1) PRIMARY KEY);
34-
SET @@GLOBAL.DEBUG= @debug_saved;
35-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_insert_collation';
36-
INSERT INTO t1 VALUES(1);
37-
SET @@GLOBAL.DEBUG= @debug_saved;
38-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_key_generated_update_collation';
39-
UPDATE t1 SET a=3 WHERE a=1;
40-
SET @@GLOBAL.DEBUG= @debug_saved;
41-
--source include/rpl_sync.inc
42-
DROP TABLE t1;
43-
--source include/rpl_sync.inc
44-
4531
# Table with multi values pimary key field with insert and update
4632

47-
--connection master
4833
CREATE TABLE t1(a INT, b INT, PRIMARY KEY(a, b));
4934
SET @@GLOBAL.DEBUG= @debug_saved;
5035
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_insert';
@@ -57,20 +42,6 @@ SET @@GLOBAL.DEBUG= @debug_saved;
5742
DROP TABLE t1;
5843
--source include/rpl_sync.inc
5944

60-
# tests both writeset algorithm (with and without collation)
61-
--connection master
62-
CREATE TABLE t1(a BINARY(1), b BINARY(1), PRIMARY KEY(a, b));
63-
SET @@GLOBAL.DEBUG= @debug_saved;
64-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_insert_collation';
65-
INSERT INTO t1 VALUE(1, 2);
66-
SET @@GLOBAL.DEBUG= @debug_saved;
67-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_key_generated_update_collation';
68-
UPDATE t1 SET a=3 WHERE a=1;
69-
SET @@GLOBAL.DEBUG= @debug_saved;
70-
--source include/rpl_sync.inc
71-
DROP TABLE t1;
72-
--source include/rpl_sync.inc
73-
7445
# Table with single primary key and multiple unique key with insert and
7546
# updates.
7647

@@ -86,23 +57,9 @@ UPDATE t1 SET c1=5 WHERE c1=1;
8657
DROP TABLE t1;
8758
--source include/rpl_sync.inc
8859

89-
# tests both writeset algorithm (with and without collation)
90-
--connection master
91-
CREATE TABLE t1 (c1 BINARY(1) PRIMARY KEY, c2 BINARY(1) NOT NULL UNIQUE, c3 BINARY(1) NOT NULL UNIQUE);
92-
SET @@GLOBAL.DEBUG= @debug_saved;
93-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_insert_collation';
94-
INSERT INTO t1 VALUES (1, 2, 3);
95-
SET @@GLOBAL.DEBUG= @debug_saved;
96-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_single_primary_unique_key_generated_update_collation';
97-
UPDATE t1 SET c1=5 WHERE c1=1;
98-
--source include/rpl_sync.inc
99-
DROP TABLE t1;
100-
--source include/rpl_sync.inc
101-
10260
# Table with multi valued primary key and multiple unique key with insert and
10361
# updates.
10462

105-
--connection master
10663
CREATE TABLE t1 (a INT, d INT, b INT NOT NULL UNIQUE, c INT NOT NULL UNIQUE, PRIMARY KEY(a, d));
10764
SET @@GLOBAL.DEBUG= @debug_saved;
10865
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_insert';
@@ -115,20 +72,6 @@ SET @@GLOBAL.DEBUG= @debug_saved;
11572
DROP TABLE t1;
11673
--source include/rpl_sync.inc
11774

118-
# tests both writeset algorithm (with and without collation)
119-
--connection master
120-
CREATE TABLE t1 (a BINARY(1), d BINARY(1), b BINARY(1) NOT NULL UNIQUE, c BINARY(1) NOT NULL UNIQUE, PRIMARY KEY(a, d));
121-
SET @@GLOBAL.DEBUG= @debug_saved;
122-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_insert_collation';
123-
INSERT INTO t1 VALUES(1, 2, 3, 4);
124-
SET @@GLOBAL.DEBUG= @debug_saved;
125-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_primary_unique_key_generated_update_collation';
126-
UPDATE t1 SET a=5 WHERE a=1;
127-
SET @@GLOBAL.DEBUG= @debug_saved;
128-
--source include/rpl_sync.inc
129-
DROP TABLE t1;
130-
--source include/rpl_sync.inc
131-
13275
# Table with Primary Key + Unique Key and Foreign Key
13376

13477
--connection master
@@ -154,27 +97,4 @@ DROP TABLE t2;
15497
DROP TABLE t1;
15598
--source include/rpl_sync.inc
15699

157-
# tests both writeset algorithm (with and without collation)
158-
--connection master
159-
CREATE TABLE t1 (a BINARY(1) PRIMARY KEY);
160-
CREATE TABLE t2 (b BINARY(1) PRIMARY KEY);
161-
CREATE TABLE t3 (c1 BINARY(1), c2 BINARY(1) NOT NULL UNIQUE, PRIMARY KEY(c1, c2), FOREIGN KEY(c1) REFERENCES t1(a), FOREIGN KEY(c2) REFERENCES t2(b));
162-
163-
INSERT INTO t1 VALUES (1);
164-
INSERT INTO t2 VALUES (5);
165-
SET @@GLOBAL.DEBUG= @debug_saved;
166-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_foreign_key_generated_insert_collation';
167-
INSERT INTO t3 values(1,5);
168-
SET @@GLOBAL.DEBUG= @debug_saved;
169-
INSERT INTO t1 VALUES (3);
170-
--source include/rpl_sync.inc
171-
SET @@GLOBAL.DEBUG= '+d,PKE_assert_multi_foreign_key_generated_update_collation';
172-
UPDATE t3 SET c1=3 WHERE c1=1;
173-
--source include/rpl_sync.inc
174-
SET @@GLOBAL.DEBUG= @debug_saved;
175-
DROP TABLE t3;
176-
DROP TABLE t2;
177-
DROP TABLE t1;
178-
--source include/rpl_sync.inc
179-
180100
--source include/rpl_end.inc

‎rapid/plugin/group_replication/tests/mtr/r/gr_certifier_garbage_collection.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ UPDATE t1 SET c1=2 WHERE c1=1;
3838
# After garbage collection certification info will contain:
3939
# WS: t1.c1=1 -> 8a94f357-aab4-11df-86ab-c80aa9422222:1-4
4040
# WS: t1.c1=2 -> 8a94f357-aab4-11df-86ab-c80aa9422222:1-4
41-
include/assert.inc ['Count_transactions_rows_validating must be 4']
41+
include/assert.inc ['Count_transactions_rows_validating must be 2']
4242
include/assert.inc ['Transactions_committed_all_members must be equal to 8a94f357-aab4-11df-86ab-c80aa9422222:1-4']
43-
include/assert.inc ['Count_transactions_rows_validating must be 4']
43+
include/assert.inc ['Count_transactions_rows_validating must be 2']
4444
include/assert.inc ['Transactions_committed_all_members must be equal to 8a94f357-aab4-11df-86ab-c80aa9422222:1-4']
4545

4646
############################################################

‎rapid/plugin/group_replication/tests/mtr/r/gr_collations_key_conflict.result

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎rapid/plugin/group_replication/tests/mtr/r/gr_perfschema_group_member_stats.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ server1
5353
include/assert.inc [The value of member_id should be equal to server UUID after starting group replication]
5454
include/assert.inc [The value of Count_Transactions_checked should be 6 after starting group replication]
5555
include/assert.inc [The value of Count_conflicts_detected should be 0 after starting group replication]
56-
include/assert.inc [The value of Count_Transactions_rows_validating should be 4 after starting group replication]
56+
include/assert.inc [The value of Count_Transactions_rows_validating should be 2 after starting group replication]
5757
include/assert.inc [The value of Transactions_committed_all_members should have server 1 GTIDs before server2 start]
5858
include/assert.inc [The value of Last_Conflict_free_transaction should be the gtid of the last applied transaction.]
5959
SET SESSION sql_log_bin= 0;

‎rapid/plugin/group_replication/tests/mtr/t/gr_certifier_garbage_collection.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ UPDATE t1 SET c1=2 WHERE c1=1;
104104

105105
--connection server1
106106
--let $count_transactions_validating= query_get_value(SELECT Count_transactions_rows_validating from performance_schema.replication_group_member_stats, Count_transactions_rows_validating, 1)
107-
--let $assert_text= 'Count_transactions_rows_validating must be 4'
108-
--let $assert_cond= $count_transactions_validating = 4
107+
--let $assert_text= 'Count_transactions_rows_validating must be 2'
108+
--let $assert_cond= $count_transactions_validating = 2
109109
--source include/assert.inc
110110

111111
--let $transactions_committed_all_members= query_get_value(SELECT Transactions_committed_all_members from performance_schema.replication_group_member_stats, Transactions_committed_all_members, 1)
@@ -115,8 +115,8 @@ UPDATE t1 SET c1=2 WHERE c1=1;
115115

116116
--connection server2
117117
--let $count_transactions_validating= query_get_value(SELECT Count_transactions_rows_validating from performance_schema.replication_group_member_stats, Count_transactions_rows_validating, 1)
118-
--let $assert_text= 'Count_transactions_rows_validating must be 4'
119-
--let $assert_cond= $count_transactions_validating = 4
118+
--let $assert_text= 'Count_transactions_rows_validating must be 2'
119+
--let $assert_cond= $count_transactions_validating = 2
120120
--source include/assert.inc
121121

122122
--let $transactions_committed_all_members= query_get_value(SELECT Transactions_committed_all_members from performance_schema.replication_group_member_stats, Transactions_committed_all_members, 1)

0 commit comments

Comments
 (0)