Skip to content

Commit

Permalink
Adding PK to RBR inconsistency info
Browse files Browse the repository at this point in the history 
Summary:
Adding primary key info (if found) to inconsistency info for
easier debugging

Differential Revision: D50565200

fbshipit-source-id: 15893da7018f598b1ca32ead20fd7c521c9442f9
  • Loading branch information
@abhinav04sharma @facebook-github-bot
abhinav04sharma authored and facebook-github-bot committed Oct 25, 2023
1 parent 996dabc commit 230003a
Show file tree
Hide file tree
Showing 11 changed files with 151 additions and 81 deletions.
2 changes: 2 additions & 0 deletions mysql-test/suite/funcs_1/r/is_columns_is_cs.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ def information_schema RBR_BI_INCONSISTENCIES LAST_GTID 2 NO varchar 64 192 NUL
def information_schema RBR_BI_INCONSISTENCIES SOURCE_LOG_POS 3 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(192) select NULL #
def information_schema RBR_BI_INCONSISTENCIES SOURCE_IMAGE 4 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(192) select NULL #
def information_schema RBR_BI_INCONSISTENCIES LOCAL_IMAGE 5 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(192) select NULL #
def information_schema RBR_BI_INCONSISTENCIES PRIMARY_KEY 6 NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(192) select NULL #
def information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_CATALOG 1 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) select NULL #
def information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA 2 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) select NULL #
def information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_NAME 3 NULL YES varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) select NULL #
Expand Down Expand Up @@ -1028,6 +1029,7 @@ NULL information_schema QUERY_PERF_COUNTER NUM_QUERIES bigint NULL NULL NULL NUL
3.0000 information_schema RBR_BI_INCONSISTENCIES SOURCE_LOG_POS varchar 64 192 utf8 utf8_general_ci varchar(192)
3.0000 information_schema RBR_BI_INCONSISTENCIES SOURCE_IMAGE varchar 64 192 utf8 utf8_general_ci varchar(192)
3.0000 information_schema RBR_BI_INCONSISTENCIES LOCAL_IMAGE varchar 64 192 utf8 utf8_general_ci varchar(192)
3.0000 information_schema RBR_BI_INCONSISTENCIES PRIMARY_KEY varchar 64 192 utf8 utf8_general_ci varchar(192)
3.0000 information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_CATALOG varchar 64 192 utf8 utf8_bin varchar(64)
3.0000 information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA varchar 64 192 utf8 utf8_bin varchar(64)
3.0000 information_schema REFERENTIAL_CONSTRAINTS CONSTRAINT_NAME varchar 64 192 utf8 utf8_bin varchar(64)
Expand Down
42 changes: 21 additions & 21 deletions mysql-test/suite/rocksdb_rpl/r/rocksdb_slave_check_before_image_consistency.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:12 master-bin.000001:3440 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:12 master-bin.000001:3440 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t1 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -44,8 +44,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:12 master-bin.000001:3440 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:12 master-bin.000001:3440 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t2 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -58,8 +58,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:12 master-bin.000001:3440 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:12 master-bin.000001:3440 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t3 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -71,8 +71,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:12 master-bin.000001:3440 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:12 master-bin.000001:3440 c=1 c=2 a=1
include/wait_for_slave_sql_error.inc [errno=1032]
set @@sql_log_bin = 0;
update t4 set c = 1;
Expand All @@ -93,7 +93,7 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 0
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
select * from t1;
a b c
Expand Down Expand Up @@ -153,8 +153,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:32 master-bin.000001:8661 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:32 master-bin.000001:8661 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t1 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -167,8 +167,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:32 master-bin.000001:8661 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:32 master-bin.000001:8661 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t2 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -181,8 +181,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:32 master-bin.000001:8661 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:32 master-bin.000001:8661 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t3 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -194,8 +194,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:32 master-bin.000001:8661 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:32 master-bin.000001:8661 c=1 c=2 a=1
include/wait_for_slave_sql_error.inc [errno=1032]
set @@sql_log_bin = 0;
update t4 set c = 1;
Expand All @@ -216,7 +216,7 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 0
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
select * from t1;
a b c
Expand Down Expand Up @@ -264,8 +264,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.ttl_table uuid:47 master-bin.000001:12746 b=1 b=11
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.ttl_table uuid:47 master-bin.000001:12746 b=1 b=11 a=pk
set @@global.slave_check_before_image_consistency = OFF;
set @@global.slave_check_before_image_consistency = COUNT;
set @@global.enable_strict_consistency_for_ttl_tables = 0;
Expand All @@ -275,7 +275,7 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 0
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
drop table ttl_table;
include/sync_slave_sql_with_master.inc
include/stop_slave.inc
Expand Down
18 changes: 9 additions & 9 deletions mysql-test/suite/rocksdb_rpl/r/rocksdb_slave_check_before_image_float_consistency.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ include/wait_for_slave_sql_error.inc [errno=50306]
inconsistency_count
1
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321 a=1
set @@sql_log_bin = 0;
update t1 set c = 0.798320;
set @@sql_log_bin = 1;
Expand All @@ -41,9 +41,9 @@ include/wait_for_slave_sql_error.inc [errno=50306]
inconsistency_count
2
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321
test.t2 uuid:9 master-bin.000001:2584 c=0.79832 c=0.798321
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321 a=1
test.t2 uuid:9 master-bin.000001:2584 c=0.79832 c=0.798321
set @@sql_log_bin = 0;
update t2 set c = 0.798320;
set @@sql_log_bin = 1;
Expand All @@ -58,10 +58,10 @@ include/wait_for_slave_sql_error.inc [errno=50306]
inconsistency_count
3
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321
test.t2 uuid:9 master-bin.000001:2584 c=0.79832 c=0.798321
test.t3 uuid:10 master-bin.000001:2892 c=0.79832 c=0.798321
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:8 master-bin.000001:2278 c=0.79832 c=0.798321 a=1
test.t2 uuid:9 master-bin.000001:2584 c=0.79832 c=0.798321
test.t3 uuid:10 master-bin.000001:2892 c=0.79832 c=0.798321 a=1
set @@sql_log_bin = 0;
update t3 set c = 0.798320;
set @@sql_log_bin = 1;
Expand Down
6 changes: 4 additions & 2 deletions mysql-test/suite/rocksdb_rpl/t/rocksdb_slave_check_before_image_consistency.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ update ttl_table set b = 100 where b = 1;
source include/sync_slave_sql_with_master.inc;

connection slave;
let $pk = `select a from ttl_table where b = 100`;
show status like 'Slave_before_image_inconsistencies';
replace_result $uuid uuid;
replace_result $uuid uuid $pk pk;
select * from information_schema.RBR_BI_INCONSISTENCIES;

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

connection slave;
let $pk = `select a from ttl_table where b = 200`;
show status like 'Slave_before_image_inconsistencies';
replace_result $uuid uuid;
replace_result $uuid uuid $pk pk;
select * from information_schema.RBR_BI_INCONSISTENCIES;

# cleanup
Expand Down
36 changes: 18 additions & 18 deletions mysql-test/suite/rpl/r/rpl_slave_check_before_image_consistency.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:11 master-bin.000001:3091 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:11 master-bin.000001:3091 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t1 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -44,8 +44,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:11 master-bin.000001:3091 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:11 master-bin.000001:3091 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t2 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -58,8 +58,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:11 master-bin.000001:3091 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:11 master-bin.000001:3091 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t3 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -71,8 +71,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:11 master-bin.000001:3091 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:11 master-bin.000001:3091 c=1 c=2 a=1
include/wait_for_slave_sql_error.inc [errno=1032]
set @@sql_log_bin = 0;
update t4 set c = 1;
Expand All @@ -93,7 +93,7 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 0
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
select * from t1;
a b c
Expand Down Expand Up @@ -153,8 +153,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:31 master-bin.000001:8380 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:31 master-bin.000001:8380 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t1 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -167,8 +167,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:31 master-bin.000001:8380 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:31 master-bin.000001:8380 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t2 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -181,8 +181,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:31 master-bin.000001:8380 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:31 master-bin.000001:8380 c=1 c=2 a=1
set @@sql_log_bin = 0;
update t3 set c = 1;
set @@sql_log_bin = 1;
Expand All @@ -194,8 +194,8 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 1
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:31 master-bin.000001:8380 c=1 c=2
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:31 master-bin.000001:8380 c=1 c=2 a=1
include/wait_for_slave_sql_error.inc [errno=1032]
set @@sql_log_bin = 0;
update t4 set c = 1;
Expand All @@ -216,7 +216,7 @@ show status like 'Slave_before_image_inconsistencies';
Variable_name Value
Slave_before_image_inconsistencies 0
select * from information_schema.RBR_BI_INCONSISTENCIES;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
set @@global.debug = "-d,dbg.fire_bi_inconsistency";
select * from t1;
a b c
Expand Down
18 changes: 9 additions & 9 deletions mysql-test/suite/rpl/r/rpl_slave_check_before_image_float_consistency.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ include/wait_for_slave_sql_error.inc [errno=50306]
inconsistency_count
1
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321 a=1
set @@sql_log_bin = 0;
update t1 set c = 0.798320;
set @@sql_log_bin = 1;
Expand All @@ -42,9 +42,9 @@ include/wait_for_slave_sql_error.inc [errno=50306]
inconsistency_count
2
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321
test.t2 uuid:9 master-bin.000001:2608 c=0.79832 c=0.798321
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321 a=1
test.t2 uuid:9 master-bin.000001:2608 c=0.79832 c=0.798321
set @@sql_log_bin = 0;
update t2 set c = 0.798320;
set @@sql_log_bin = 1;
Expand All @@ -59,10 +59,10 @@ include/wait_for_slave_sql_error.inc [errno=50306]
inconsistency_count
3
select * from information_schema.RBR_BI_INCONSISTENCIES ORDER BY SOURCE_LOG_POS;
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321
test.t2 uuid:9 master-bin.000001:2608 c=0.79832 c=0.798321
test.t3 uuid:10 master-bin.000001:2916 c=0.79832 c=0.798321
TABLE LAST_GTID SOURCE_LOG_POS SOURCE_IMAGE LOCAL_IMAGE PRIMARY_KEY
test.t1 uuid:8 master-bin.000001:2302 c=0.79832 c=0.798321 a=1
test.t2 uuid:9 master-bin.000001:2608 c=0.79832 c=0.798321
test.t3 uuid:10 master-bin.000001:2916 c=0.79832 c=0.798321 a=1
set @@sql_log_bin = 0;
update t3 set c = 0.798320;
set @@sql_log_bin = 1;
Expand Down
2 changes: 1 addition & 1 deletion share/messages_to_clients.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10191,7 +10191,7 @@ ER_DB_DISCOVERY_FAILURE
eng "Placeholder"

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

#
# End of new range for 5.6.35 FB MySQL error messages.
Expand Down
Loading

0 comments on commit 230003a

Please sign in to comment.