Skip to content

Commit aa4530e

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 598f695 commit aa4530e

11 files changed

+143
-73
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 utf8mb3_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 utf8mb3_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:3445 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:3445 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:3445 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:3445 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:3445 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:3445 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:3445 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:3445 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
@@ -150,8 +150,8 @@ show status like 'Slave_before_image_inconsistencies';
150150
Variable_name Value
151151
Slave_before_image_inconsistencies 1
152152
select * from information_schema.RBR_BI_INCONSISTENCIES;
153-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
154-
test.t1 uuid:32 master-bin.000001:8666 c=1 c=2
153+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
154+
test.t1 uuid:32 master-bin.000001:8666 c=1 c=2 a=1
155155
set @@sql_log_bin = 0;
156156
update t1 set c = 1;
157157
set @@sql_log_bin = 1;
@@ -164,8 +164,8 @@ show status like 'Slave_before_image_inconsistencies';
164164
Variable_name Value
165165
Slave_before_image_inconsistencies 1
166166
select * from information_schema.RBR_BI_INCONSISTENCIES;
167-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
168-
test.t1 uuid:32 master-bin.000001:8666 c=1 c=2
167+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
168+
test.t1 uuid:32 master-bin.000001:8666 c=1 c=2 a=1
169169
set @@sql_log_bin = 0;
170170
update t2 set c = 1;
171171
set @@sql_log_bin = 1;
@@ -178,8 +178,8 @@ show status like 'Slave_before_image_inconsistencies';
178178
Variable_name Value
179179
Slave_before_image_inconsistencies 1
180180
select * from information_schema.RBR_BI_INCONSISTENCIES;
181-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
182-
test.t1 uuid:32 master-bin.000001:8666 c=1 c=2
181+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
182+
test.t1 uuid:32 master-bin.000001:8666 c=1 c=2 a=1
183183
set @@sql_log_bin = 0;
184184
update t3 set c = 1;
185185
set @@sql_log_bin = 1;
@@ -191,8 +191,8 @@ show status like 'Slave_before_image_inconsistencies';
191191
Variable_name Value
192192
Slave_before_image_inconsistencies 1
193193
select * from information_schema.RBR_BI_INCONSISTENCIES;
194-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
195-
test.t1 uuid:32 master-bin.000001:8666 c=1 c=2
194+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
195+
test.t1 uuid:32 master-bin.000001:8666 c=1 c=2 a=1
196196
include/wait_for_slave_sql_error.inc [errno=1032]
197197
set @@sql_log_bin = 0;
198198
update t4 set c = 1;
@@ -213,7 +213,7 @@ show status like 'Slave_before_image_inconsistencies';
213213
Variable_name Value
214214
Slave_before_image_inconsistencies 0
215215
select * from information_schema.RBR_BI_INCONSISTENCIES;
216-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
216+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
217217
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
218218
select * from t1;
219219
a b c
@@ -261,8 +261,8 @@ show status like 'Slave_before_image_inconsistencies';
261261
Variable_name Value
262262
Slave_before_image_inconsistencies 1
263263
select * from information_schema.RBR_BI_INCONSISTENCIES;
264-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
265-
test.ttl_table uuid:47 master-bin.000001:12751 b=1 b=11
264+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
265+
test.ttl_table uuid:47 master-bin.000001:12751 b=1 b=11 a=pk
266266
set @@global.slave_check_before_image_consistency = OFF;
267267
set @@global.slave_check_before_image_consistency = COUNT;
268268
set @@global.enable_strict_consistency_for_ttl_tables = 0;
@@ -272,7 +272,7 @@ show status like 'Slave_before_image_inconsistencies';
272272
Variable_name Value
273273
Slave_before_image_inconsistencies 0
274274
select * from information_schema.RBR_BI_INCONSISTENCIES;
275-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
275+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
276276
drop table ttl_table;
277277
include/sync_slave_sql_with_master.inc
278278
include/stop_slave.inc

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ include/wait_for_slave_sql_error.inc [errno=50306]
2222
inconsistency_count
2323
1
2424
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
25-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
26-
test.t1 uuid:8 master-bin.000001:2279 c=0.79832 c=0.798321
25+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
26+
test.t1 uuid:8 master-bin.000001:2279 c=0.79832 c=0.798321 a=1
2727
set @@sql_log_bin = 0;
2828
update t1 set c = 0.798320;
2929
set @@sql_log_bin = 1;
@@ -38,9 +38,9 @@ include/wait_for_slave_sql_error.inc [errno=50306]
3838
inconsistency_count
3939
2
4040
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
41-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
42-
test.t1 uuid:8 master-bin.000001:2279 c=0.79832 c=0.798321
43-
test.t3 uuid:9 master-bin.000001:2587 c=0.79832 c=0.798321
41+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
42+
test.t1 uuid:8 master-bin.000001:2279 c=0.79832 c=0.798321 a=1
43+
test.t3 uuid:9 master-bin.000001:2587 c=0.79832 c=0.798321 a=1
4444
set @@sql_log_bin = 0;
4545
update t3 set c = 0.798320;
4646
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
@@ -43,8 +43,9 @@ update ttl_table set b = 100 where b = 1;
4343
source include/sync_slave_sql_with_master.inc;
4444

4545
connection slave;
46+
let $pk = `select a from ttl_table where b = 100`;
4647
show status like 'Slave_before_image_inconsistencies';
47-
replace_result $uuid uuid;
48+
replace_result $uuid uuid $pk pk;
4849
select * from information_schema.RBR_BI_INCONSISTENCIES;
4950

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

6263
connection slave;
64+
let $pk = `select a from ttl_table where b = 200`;
6365
show status like 'Slave_before_image_inconsistencies';
64-
replace_result $uuid uuid;
66+
replace_result $uuid uuid $pk pk;
6567
select * from information_schema.RBR_BI_INCONSISTENCIES;
6668

6769
# 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:3094 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:3094 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:3094 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:3094 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:3094 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:3094 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:3094 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:3094 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
@@ -150,8 +150,8 @@ show status like 'Slave_before_image_inconsistencies';
150150
Variable_name Value
151151
Slave_before_image_inconsistencies 1
152152
select * from information_schema.RBR_BI_INCONSISTENCIES;
153-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
154-
test.t1 uuid:31 master-bin.000001:8383 c=1 c=2
153+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
154+
test.t1 uuid:31 master-bin.000001:8383 c=1 c=2 a=1
155155
set @@sql_log_bin = 0;
156156
update t1 set c = 1;
157157
set @@sql_log_bin = 1;
@@ -164,8 +164,8 @@ show status like 'Slave_before_image_inconsistencies';
164164
Variable_name Value
165165
Slave_before_image_inconsistencies 1
166166
select * from information_schema.RBR_BI_INCONSISTENCIES;
167-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
168-
test.t1 uuid:31 master-bin.000001:8383 c=1 c=2
167+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
168+
test.t1 uuid:31 master-bin.000001:8383 c=1 c=2 a=1
169169
set @@sql_log_bin = 0;
170170
update t2 set c = 1;
171171
set @@sql_log_bin = 1;
@@ -178,8 +178,8 @@ show status like 'Slave_before_image_inconsistencies';
178178
Variable_name Value
179179
Slave_before_image_inconsistencies 1
180180
select * from information_schema.RBR_BI_INCONSISTENCIES;
181-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
182-
test.t1 uuid:31 master-bin.000001:8383 c=1 c=2
181+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
182+
test.t1 uuid:31 master-bin.000001:8383 c=1 c=2 a=1
183183
set @@sql_log_bin = 0;
184184
update t3 set c = 1;
185185
set @@sql_log_bin = 1;
@@ -191,8 +191,8 @@ show status like 'Slave_before_image_inconsistencies';
191191
Variable_name Value
192192
Slave_before_image_inconsistencies 1
193193
select * from information_schema.RBR_BI_INCONSISTENCIES;
194-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
195-
test.t1 uuid:31 master-bin.000001:8383 c=1 c=2
194+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
195+
test.t1 uuid:31 master-bin.000001:8383 c=1 c=2 a=1
196196
include/wait_for_slave_sql_error.inc [errno=1032]
197197
set @@sql_log_bin = 0;
198198
update t4 set c = 1;
@@ -213,7 +213,7 @@ show status like 'Slave_before_image_inconsistencies';
213213
Variable_name Value
214214
Slave_before_image_inconsistencies 0
215215
select * from information_schema.RBR_BI_INCONSISTENCIES;
216-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
216+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
217217
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
218218
select * from t1;
219219
a b c

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ include/wait_for_slave_sql_error.inc [errno=50306]
2323
inconsistency_count
2424
1
2525
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
26-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
27-
test.t1 uuid:8 master-bin.000001:2303 c=0.79832 c=0.798321
26+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
27+
test.t1 uuid:8 master-bin.000001:2303 c=0.79832 c=0.798321 a=1
2828
set @@sql_log_bin = 0;
2929
update t1 set c = 0.798320;
3030
set @@sql_log_bin = 1;
@@ -39,9 +39,9 @@ include/wait_for_slave_sql_error.inc [errno=50306]
3939
inconsistency_count
4040
2
4141
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
42-
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
43-
test.t1 uuid:8 master-bin.000001:2303 c=0.79832 c=0.798321
44-
test.t3 uuid:9 master-bin.000001:2611 c=0.79832 c=0.798321
42+
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
43+
test.t1 uuid:8 master-bin.000001:2303 c=0.79832 c=0.798321 a=1
44+
test.t3 uuid:9 master-bin.000001:2611 c=0.79832 c=0.798321 a=1
4545
set @@sql_log_bin = 0;
4646
update t3 set c = 0.798320;
4747
set @@sql_log_bin = 1;

‎share/messages_to_clients.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10801,7 +10801,7 @@ ER_DB_DISCOVERY_FAILURE
1080110801
eng "Placeholder"
1080210802

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

1080610806
#
1080710807
# End of new range for 5.6.35 FB MySQL error messages.

0 commit comments

Comments
 (0)