Skip to content

Commit a07a1b7

Browse files
abhinav04sharmainikep
abhinav04sharma
authored and
inikep
committed
Adding PK to RBR inconsistency info
Summary: Adding primary key info (if found) to inconsistency info for easier debugging Differential Revision: D50565200
1 parent 73ced31 commit a07a1b7

11 files changed

+151
-81
lines changed

‎mysql-test/suite/funcs_1/r/is_columns_is_cs.result‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ def information_schema RBR_BI_INCONSISTENCIES LAST_GTID 2 NO varchar 64 192 NUL
275275
def information_schema RBR_BI_INCONSISTENCIES SOURCE_LOG_POS 3 NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(192) select NULL #
276276
def information_schema RBR_BI_INCONSISTENCIES SOURCE_IMAGE 4 NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(192) select NULL #
277277
def information_schema RBR_BI_INCONSISTENCIES LOCAL_IMAGE 5 NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(192) select NULL #
278+
def information_schema RBR_BI_INCONSISTENCIES PRIMARY_KEY 6 NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_general_ci varchar(192) select NULL #
278279
def information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_CATALOG 1 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(64) select NULL #
279280
def information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA 2 NULL NO varchar 64 192 NULL NULL NULL utf8mb3 utf8mb3_bin varchar(64) select NULL #
280281
def information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_NAME 3 NULL YES varchar 64 192 NULL NULL NULL utf8mb3 utf8_bin varchar(64) select NULL #
@@ -894,6 +895,7 @@ NULL information_schema QUERY_PERF_COUNTER NUM_QUERIES bigint NULL NULL NULL NUL
894895
3.0000 information_schema RBR_BI_INCONSISTENCIES SOURCE_LOG_POS varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(192)
895896
3.0000 information_schema RBR_BI_INCONSISTENCIES SOURCE_IMAGE varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(192)
896897
3.0000 information_schema RBR_BI_INCONSISTENCIES LOCAL_IMAGE varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(192)
898+
3.0000 information_schema RBR_BI_INCONSISTENCIES PRIMARY_KEY varchar 64 192 utf8mb3 utf8mb3_general_ci varchar(192)
897899
3.0000 information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_CATALOG varchar 64 192 utf8mb3 utf8mb3_bin varchar(64)
898900
3.0000 information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA varchar 64 192 utf8mb3 utf8mb3_bin varchar(64)
899901
3.0000 information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_NAME varchar 64 192 utf8mb3 utf8_bin varchar(64)

‎mysql-test/suite/rocksdb_rpl/r/rocksdb_slave_check_before_image_consistency.result‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ show status like 'Slave_before_image_inconsistencies';
3030
Variable_name Value
3131
Slave_before_image_inconsistencies 1
3232
select * from information_schema.RBR_BI_INCONSISTENCIES;
33-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
34-
test.t1 uuid:12 master-bin.000001:3444 c=1 c=2
33+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
34+
test.t1 uuid:12 master-bin.000001:3444 c=1 c=2 a=1
3535
set @@sql_log_bin = 0;
3636
update t1 set c = 1;
3737
set @@sql_log_bin = 1;
@@ -44,8 +44,8 @@ show status like 'Slave_before_image_inconsistencies';
4444
Variable_name Value
4545
Slave_before_image_inconsistencies 1
4646
select * from information_schema.RBR_BI_INCONSISTENCIES;
47-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
48-
test.t1 uuid:12 master-bin.000001:3444 c=1 c=2
47+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
48+
test.t1 uuid:12 master-bin.000001:3444 c=1 c=2 a=1
4949
set @@sql_log_bin = 0;
5050
update t2 set c = 1;
5151
set @@sql_log_bin = 1;
@@ -58,8 +58,8 @@ show status like 'Slave_before_image_inconsistencies';
5858
Variable_name Value
5959
Slave_before_image_inconsistencies 1
6060
select * from information_schema.RBR_BI_INCONSISTENCIES;
61-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
62-
test.t1 uuid:12 master-bin.000001:3444 c=1 c=2
61+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
62+
test.t1 uuid:12 master-bin.000001:3444 c=1 c=2 a=1
6363
set @@sql_log_bin = 0;
6464
update t3 set c = 1;
6565
set @@sql_log_bin = 1;
@@ -71,8 +71,8 @@ show status like 'Slave_before_image_inconsistencies';
7171
Variable_name Value
7272
Slave_before_image_inconsistencies 1
7373
select * from information_schema.RBR_BI_INCONSISTENCIES;
74-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
75-
test.t1 uuid:12 master-bin.000001:3444 c=1 c=2
74+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
75+
test.t1 uuid:12 master-bin.000001:3444 c=1 c=2 a=1
7676
include/wait_for_slave_sql_error.inc [errno=1032]
7777
set @@sql_log_bin = 0;
7878
update t4 set c = 1;
@@ -93,7 +93,7 @@ show status like 'Slave_before_image_inconsistencies';
9393
Variable_name Value
9494
Slave_before_image_inconsistencies 0
9595
select * from information_schema.RBR_BI_INCONSISTENCIES;
96-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
96+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
9797
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
9898
select * from t1;
9999
a b c
@@ -153,8 +153,8 @@ show status like 'Slave_before_image_inconsistencies';
153153
Variable_name Value
154154
Slave_before_image_inconsistencies 1
155155
select * from information_schema.RBR_BI_INCONSISTENCIES;
156-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
157-
test.t1 uuid:32 master-bin.000001:8665 c=1 c=2
156+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
157+
test.t1 uuid:32 master-bin.000001:8665 c=1 c=2 a=1
158158
set @@sql_log_bin = 0;
159159
update t1 set c = 1;
160160
set @@sql_log_bin = 1;
@@ -167,8 +167,8 @@ show status like 'Slave_before_image_inconsistencies';
167167
Variable_name Value
168168
Slave_before_image_inconsistencies 1
169169
select * from information_schema.RBR_BI_INCONSISTENCIES;
170-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
171-
test.t1 uuid:32 master-bin.000001:8665 c=1 c=2
170+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
171+
test.t1 uuid:32 master-bin.000001:8665 c=1 c=2 a=1
172172
set @@sql_log_bin = 0;
173173
update t2 set c = 1;
174174
set @@sql_log_bin = 1;
@@ -181,8 +181,8 @@ show status like 'Slave_before_image_inconsistencies';
181181
Variable_name Value
182182
Slave_before_image_inconsistencies 1
183183
select * from information_schema.RBR_BI_INCONSISTENCIES;
184-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
185-
test.t1 uuid:32 master-bin.000001:8665 c=1 c=2
184+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
185+
test.t1 uuid:32 master-bin.000001:8665 c=1 c=2 a=1
186186
set @@sql_log_bin = 0;
187187
update t3 set c = 1;
188188
set @@sql_log_bin = 1;
@@ -194,8 +194,8 @@ show status like 'Slave_before_image_inconsistencies';
194194
Variable_name Value
195195
Slave_before_image_inconsistencies 1
196196
select * from information_schema.RBR_BI_INCONSISTENCIES;
197-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
198-
test.t1 uuid:32 master-bin.000001:8665 c=1 c=2
197+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
198+
test.t1 uuid:32 master-bin.000001:8665 c=1 c=2 a=1
199199
include/wait_for_slave_sql_error.inc [errno=1032]
200200
set @@sql_log_bin = 0;
201201
update t4 set c = 1;
@@ -216,7 +216,7 @@ show status like 'Slave_before_image_inconsistencies';
216216
Variable_name Value
217217
Slave_before_image_inconsistencies 0
218218
select * from information_schema.RBR_BI_INCONSISTENCIES;
219-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
219+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
220220
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
221221
select * from t1;
222222
a b c
@@ -264,8 +264,8 @@ show status like 'Slave_before_image_inconsistencies';
264264
Variable_name Value
265265
Slave_before_image_inconsistencies 1
266266
select * from information_schema.RBR_BI_INCONSISTENCIES;
267-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
268-
test.ttl_table uuid:47 master-bin.000001:12750 b=1 b=11
267+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
268+
test.ttl_table uuid:47 master-bin.000001:12750 b=1 b=11 a=pk
269269
set @@global.slave_check_before_image_consistency = OFF;
270270
set @@global.slave_check_before_image_consistency = COUNT;
271271
set @@global.enable_strict_consistency_for_ttl_tables = 0;
@@ -275,7 +275,7 @@ show status like 'Slave_before_image_inconsistencies';
275275
Variable_name Value
276276
Slave_before_image_inconsistencies 0
277277
select * from information_schema.RBR_BI_INCONSISTENCIES;
278-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
278+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
279279
drop table ttl_table;
280280
include/sync_slave_sql_with_master.inc
281281
include/stop_slave.inc

‎mysql-test/suite/rocksdb_rpl/r/rocksdb_slave_check_before_image_float_consistency.result‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ include/wait_for_slave_sql_error.inc [errno=50306]
2525
inconsistency_count
2626
1
2727
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
28-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
29-
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321
28+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
29+
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321 a=1
3030
set @@sql_log_bin = 0;
3131
update t1 set c = 0.798320;
3232
set @@sql_log_bin = 1;
@@ -41,9 +41,9 @@ include/wait_for_slave_sql_error.inc [errno=50306]
4141
inconsistency_count
4242
2
4343
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
44-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
45-
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321
46-
test.t2 uuid:9 master-bin.000001:2584 c=0.79832 c=0.798321
44+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
45+
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321 a=1
46+
test.t2 uuid:9 master-bin.000001:2584 c=0.79832 c=0.798321
4747
set @@sql_log_bin = 0;
4848
update t2 set c = 0.798320;
4949
set @@sql_log_bin = 1;
@@ -58,10 +58,10 @@ include/wait_for_slave_sql_error.inc [errno=50306]
5858
inconsistency_count
5959
3
6060
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
61-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
62-
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321
63-
test.t2 uuid:9 master-bin.000001:2584 c=0.79832 c=0.798321
64-
test.t3 uuid:10 master-bin.000001:2892 c=0.79832 c=0.798321
61+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
62+
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321 a=1
63+
test.t2 uuid:9 master-bin.000001:2584 c=0.79832 c=0.798321
64+
test.t3 uuid:10 master-bin.000001:2892 c=0.79832 c=0.798321 a=1
6565
set @@sql_log_bin = 0;
6666
update t3 set c = 0.798320;
6767
set @@sql_log_bin = 1;

‎mysql-test/suite/rocksdb_rpl/t/rocksdb_slave_check_before_image_consistency.test‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ update ttl_table set b = 100 where b = 1;
4444
source include/sync_slave_sql_with_master.inc;
4545

4646
connection slave;
47+
let $pk = `select a from ttl_table where b = 100`;
4748
show status like 'Slave_before_image_inconsistencies';
48-
replace_result $uuid uuid;
49+
replace_result $uuid uuid $pk pk;
4950
select * from information_schema.RBR_BI_INCONSISTENCIES;
5051

5152
connection slave;
@@ -61,8 +62,9 @@ update ttl_table set b = 200 where b = 2;
6162
source include/sync_slave_sql_with_master.inc;
6263

6364
connection slave;
65+
let $pk = `select a from ttl_table where b = 200`;
6466
show status like 'Slave_before_image_inconsistencies';
65-
replace_result $uuid uuid;
67+
replace_result $uuid uuid $pk pk;
6668
select * from information_schema.RBR_BI_INCONSISTENCIES;
6769

6870
# cleanup

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ show status like 'Slave_before_image_inconsistencies';
3030
Variable_name Value
3131
Slave_before_image_inconsistencies 1
3232
select * from information_schema.RBR_BI_INCONSISTENCIES;
33-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
34-
test.t1 uuid:11 master-bin.000001:3093 c=1 c=2
33+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
34+
test.t1 uuid:11 master-bin.000001:3093 c=1 c=2 a=1
3535
set @@sql_log_bin = 0;
3636
update t1 set c = 1;
3737
set @@sql_log_bin = 1;
@@ -44,8 +44,8 @@ show status like 'Slave_before_image_inconsistencies';
4444
Variable_name Value
4545
Slave_before_image_inconsistencies 1
4646
select * from information_schema.RBR_BI_INCONSISTENCIES;
47-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
48-
test.t1 uuid:11 master-bin.000001:3093 c=1 c=2
47+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
48+
test.t1 uuid:11 master-bin.000001:3093 c=1 c=2 a=1
4949
set @@sql_log_bin = 0;
5050
update t2 set c = 1;
5151
set @@sql_log_bin = 1;
@@ -58,8 +58,8 @@ show status like 'Slave_before_image_inconsistencies';
5858
Variable_name Value
5959
Slave_before_image_inconsistencies 1
6060
select * from information_schema.RBR_BI_INCONSISTENCIES;
61-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
62-
test.t1 uuid:11 master-bin.000001:3093 c=1 c=2
61+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
62+
test.t1 uuid:11 master-bin.000001:3093 c=1 c=2 a=1
6363
set @@sql_log_bin = 0;
6464
update t3 set c = 1;
6565
set @@sql_log_bin = 1;
@@ -71,8 +71,8 @@ show status like 'Slave_before_image_inconsistencies';
7171
Variable_name Value
7272
Slave_before_image_inconsistencies 1
7373
select * from information_schema.RBR_BI_INCONSISTENCIES;
74-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
75-
test.t1 uuid:11 master-bin.000001:3093 c=1 c=2
74+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
75+
test.t1 uuid:11 master-bin.000001:3093 c=1 c=2 a=1
7676
include/wait_for_slave_sql_error.inc [errno=1032]
7777
set @@sql_log_bin = 0;
7878
update t4 set c = 1;
@@ -93,7 +93,7 @@ show status like 'Slave_before_image_inconsistencies';
9393
Variable_name Value
9494
Slave_before_image_inconsistencies 0
9595
select * from information_schema.RBR_BI_INCONSISTENCIES;
96-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
96+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
9797
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
9898
select * from t1;
9999
a b c
@@ -153,8 +153,8 @@ show status like 'Slave_before_image_inconsistencies';
153153
Variable_name Value
154154
Slave_before_image_inconsistencies 1
155155
select * from information_schema.RBR_BI_INCONSISTENCIES;
156-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
157-
test.t1 uuid:31 master-bin.000001:8382 c=1 c=2
156+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
157+
test.t1 uuid:31 master-bin.000001:8382 c=1 c=2 a=1
158158
set @@sql_log_bin = 0;
159159
update t1 set c = 1;
160160
set @@sql_log_bin = 1;
@@ -167,8 +167,8 @@ show status like 'Slave_before_image_inconsistencies';
167167
Variable_name Value
168168
Slave_before_image_inconsistencies 1
169169
select * from information_schema.RBR_BI_INCONSISTENCIES;
170-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
171-
test.t1 uuid:31 master-bin.000001:8382 c=1 c=2
170+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
171+
test.t1 uuid:31 master-bin.000001:8382 c=1 c=2 a=1
172172
set @@sql_log_bin = 0;
173173
update t2 set c = 1;
174174
set @@sql_log_bin = 1;
@@ -181,8 +181,8 @@ show status like 'Slave_before_image_inconsistencies';
181181
Variable_name Value
182182
Slave_before_image_inconsistencies 1
183183
select * from information_schema.RBR_BI_INCONSISTENCIES;
184-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
185-
test.t1 uuid:31 master-bin.000001:8382 c=1 c=2
184+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
185+
test.t1 uuid:31 master-bin.000001:8382 c=1 c=2 a=1
186186
set @@sql_log_bin = 0;
187187
update t3 set c = 1;
188188
set @@sql_log_bin = 1;
@@ -194,8 +194,8 @@ show status like 'Slave_before_image_inconsistencies';
194194
Variable_name Value
195195
Slave_before_image_inconsistencies 1
196196
select * from information_schema.RBR_BI_INCONSISTENCIES;
197-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
198-
test.t1 uuid:31 master-bin.000001:8382 c=1 c=2
197+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
198+
test.t1 uuid:31 master-bin.000001:8382 c=1 c=2 a=1
199199
include/wait_for_slave_sql_error.inc [errno=1032]
200200
set @@sql_log_bin = 0;
201201
update t4 set c = 1;
@@ -216,7 +216,7 @@ show status like 'Slave_before_image_inconsistencies';
216216
Variable_name Value
217217
Slave_before_image_inconsistencies 0
218218
select * from information_schema.RBR_BI_INCONSISTENCIES;
219-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
219+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
220220
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
221221
select * from t1;
222222
a b c

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ include/wait_for_slave_sql_error.inc [errno=50306]
2626
inconsistency_count
2727
1
2828
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
29-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
30-
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321
29+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
30+
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321 a=1
3131
set @@sql_log_bin = 0;
3232
update t1 set c = 0.798320;
3333
set @@sql_log_bin = 1;
@@ -42,9 +42,9 @@ include/wait_for_slave_sql_error.inc [errno=50306]
4242
inconsistency_count
4343
2
4444
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
45-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
46-
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321
47-
test.t2 uuid:9 master-bin.000001:2608 c=0.79832 c=0.798321
45+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
46+
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321 a=1
47+
test.t2 uuid:9 master-bin.000001:2608 c=0.79832 c=0.798321
4848
set @@sql_log_bin = 0;
4949
update t2 set c = 0.798320;
5050
set @@sql_log_bin = 1;
@@ -59,10 +59,10 @@ include/wait_for_slave_sql_error.inc [errno=50306]
5959
inconsistency_count
6060
3
6161
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
62-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
63-
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321
64-
test.t2 uuid:9 master-bin.000001:2608 c=0.79832 c=0.798321
65-
test.t3 uuid:10 master-bin.000001:2916 c=0.79832 c=0.798321
62+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
63+
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321 a=1
64+
test.t2 uuid:9 master-bin.000001:2608 c=0.79832 c=0.798321
65+
test.t3 uuid:10 master-bin.000001:2916 c=0.79832 c=0.798321 a=1
6666
set @@sql_log_bin = 0;
6767
update t3 set c = 0.798320;
6868
set @@sql_log_bin = 1;

‎share/messages_to_clients.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10454,7 +10454,7 @@ ER_DB_DISCOVERY_FAILURE
1045410454
eng "Placeholder"
1045510455

1045610456
ER_RBR_BEFORE_IMAGE_INCONSISTENT
10457-
eng "Replica before-image consistency check failed at position: %s (gtid: %s). Mismatch (table: %s): %s (source) vs. %s (local)"
10457+
eng "Replica before-image consistency check failed at position: %s (gtid: %s). Mismatch (table: %s, PK: %s): %s (source) vs. %s (local)"
1045810458

1045910459
#
1046010460
# End of new range for 5.6.35 FB MySQL error messages.

0 commit comments

Comments
 (0)