mirror of
https://github.com/MariaDB/server.git
synced 2025-11-28 00:19:42 +01:00
232533978f
One can have data loss in multi-master setups when 1) both masters
update the same table, 2) ALTER TABLE is run on one master which
re-arranges the column ordering, and 3) transactions are binlogged
in ROW binlog_format.
This is because the slave assumes that all columns are in the same
order on the master and slave and all columns on the master also
exists on the slave. This happens even if binlog_row_metadata=FULL is
used. If this is not the case, this will lead to silent data loss.
A new option for slave_type_conversions bit field,
ERROR_IF_MISSING_FIELD, has been added. This allows the user to define if
the slave should abort replication if it is missing some field that
existed on the master. This option is off by default to keep things
compatible with earlier versions.
If a field is missing on the slave and log_warnings >= 1, a warning
will be logged to the error log.
This patch fixes this, when binlog_row_metadata=FULL is used on the
master, by mapping fields with identical names on the master and slave.
If slave has fields that does not exist in the row event, these will
be set to their default value.
The main idea is that we added two conversion tables:
m_tabledef.master_to_slave_map[master_column_index] -> slave_column_index
and m_tabledef.master_to_slave_error[master_column_index] which contains
an error number if the master_column does not exists on the slave or
it is not possible to convert the master data to the slave column.
master_to_slave_error[#] contains 0 if the column exists and is compatible.
General code changes:
- Instead of looping over row fields in the order of slave table
we are instead looping over fields in the order of the binary log.
- We are using table->write_set to know which fields should be updated
on the slave. This is reflected in unpack_row
- We are calling TABLE::mark_columns_per_binlog_row_image() to ensure
that rpl_write_set is properly set. This is needed if the slave also
is doing binary logging.
- Before replication aborted if the master and slave tables where too
different. Now replication is only aborted if the row actually uses
columns that does not exists on the slave (and ALLOW_MISSING_FIELDS
is not used) or uses columns that cannot be converted.
- Instead of giving errors in compatible_with(), used when table is
accessed by first the row event, we are instead giving errors
when we examine a row event and notice that it is accessing
a not existing or not compatible field.
Other code changes:
- Removed conv_table argument from compatible_with() and store it
directly in RPL_TABLE_LIST->m_conv_table
- table_def::compatible_with() returns now 1 on error (not 0).
- Remove m_width and skip arguments from prepare_record() as we are
now using table->write_set() to check which elements need a default
value.
- Moved DBUG_ENTER() to it's proper place (after variable
declarations) in a few functions.
- Some changes in unpack_row():
- Replaced null_mask and null_ptr with an indexed bit check for
simplicity.
- Removed check of rgi == null and table_found which never worked.
- Updated comments to reflect current code.
- Indentation changes as the code now uses 'continue' instead of
'if-else' in the main loop.
- The code to throw away 'extra master fields' is not needed as we
are now looping over fields in binary log, not over fields in
slave table.
- fill_extra_persistent_columns() is now using table->cond_set to know
which columns where not updated from binlog.
- Simplified get_table_data(TABLE *table_arg) by returning found
table_list.
- Errors for row events are now initialized in compatible_with(),
checked in check_wrong_column_usage() and reported in
give_compatibility_error().
Test cases and some code patchs provide by Brandon Nesterenko
<brandon.nesterenko@mariadb.com>
236 lines
6.8 KiB
Text
236 lines
6.8 KiB
Text
set @@global.log_warnings=1;
|
|
include/master-slave.inc
|
|
[connection master]
|
|
connection master;
|
|
SET SQL_LOG_BIN= 0;
|
|
CREATE TABLE t1(`a` INT, `b` DATE DEFAULT NULL,
|
|
`c` INT DEFAULT NULL,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t2(`a` INT, `b` DATE DEFAULT NULL,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t3(`a` INT, `b` DATE DEFAULT NULL,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t4(`a` INT, `b` DATE DEFAULT NULL,
|
|
`c` INT DEFAULT NULL,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
SET SQL_LOG_BIN= 1;
|
|
connection slave;
|
|
CREATE TABLE t1(`a` INT, `b` DATE DEFAULT NULL,
|
|
`c` INT DEFAULT NULL,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t2(`a` INT, `b` DATE DEFAULT NULL,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t3(`a` INT, `b` DATE DEFAULT '0000-00-00',
|
|
`c` INT DEFAULT 500,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t4(`a` INT, `b` DATE DEFAULT '0000-00-00',
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
************* EXECUTION WITH INSERTS *************
|
|
connection master;
|
|
INSERT INTO t1(a,b,c) VALUES (1, null, 1);
|
|
INSERT INTO t1(a,b,c) VALUES (2,'1111-11-11', 2);
|
|
INSERT INTO t1(a,b) VALUES (3, null);
|
|
INSERT INTO t1(a,c) VALUES (4, 4);
|
|
INSERT INTO t1(a) VALUES (5);
|
|
INSERT INTO t2(a,b) VALUES (1, null);
|
|
INSERT INTO t2(a,b) VALUES (2,'1111-11-11');
|
|
INSERT INTO t2(a) VALUES (3);
|
|
INSERT INTO t3(a,b) VALUES (1, null);
|
|
INSERT INTO t3(a,b) VALUES (2,'1111-11-11');
|
|
INSERT INTO t3(a) VALUES (3);
|
|
INSERT INTO t4(a,b,c) VALUES (1, null, 1);
|
|
INSERT INTO t4(a,b,c) VALUES (2,'1111-11-11', 2);
|
|
INSERT INTO t4(a,b) VALUES (3, null);
|
|
INSERT INTO t4(a,c) VALUES (4, 4);
|
|
INSERT INTO t4(a) VALUES (5);
|
|
************* SHOWING THE RESULT SETS WITH INSERTS *************
|
|
connection slave;
|
|
TABLES t1 and t2 must be equal otherwise an error will be thrown.
|
|
include/diff_tables.inc [master:t1, slave:t1]
|
|
include/diff_tables.inc [master:t2, slave:t2]
|
|
TABLES t2 and t3 must be different.
|
|
connection master;
|
|
SELECT * FROM t3 ORDER BY a;
|
|
a b
|
|
1 NULL
|
|
2 1111-11-11
|
|
3 NULL
|
|
connection slave;
|
|
SELECT * FROM t3 ORDER BY a;
|
|
a b c
|
|
1 NULL 500
|
|
2 1111-11-11 500
|
|
3 NULL 500
|
|
connection master;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
a b c
|
|
1 NULL 1
|
|
2 1111-11-11 2
|
|
3 NULL NULL
|
|
4 NULL 4
|
|
5 NULL NULL
|
|
connection slave;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
a b
|
|
1 NULL
|
|
2 1111-11-11
|
|
3 NULL
|
|
4 NULL
|
|
5 NULL
|
|
************* EXECUTION WITH UPDATES and REPLACES *************
|
|
connection master;
|
|
DELETE FROM t1;
|
|
INSERT INTO t1(a,b,c) VALUES (1,'1111-11-11', 1);
|
|
REPLACE INTO t1(a,b,c) VALUES (2,'1111-11-11', 2);
|
|
UPDATE t1 set b= NULL, c= 300 where a= 1;
|
|
REPLACE INTO t1(a,b,c) VALUES (2, NULL, 300);
|
|
************* SHOWING THE RESULT SETS WITH UPDATES and REPLACES *************
|
|
connection slave;
|
|
TABLES t1 and t2 must be equal otherwise an error will be thrown.
|
|
include/diff_tables.inc [master:t1, slave:t1]
|
|
************* CLEANING *************
|
|
connection master;
|
|
DROP TABLE t1;
|
|
DROP TABLE t2;
|
|
DROP TABLE t3;
|
|
DROP TABLE t4;
|
|
connection slave;
|
|
connection master;
|
|
SET SQL_LOG_BIN= 0;
|
|
CREATE TABLE t1 (`a` INT, `b` BIT DEFAULT NULL, `c` BIT DEFAULT NULL,
|
|
PRIMARY KEY (`a`)) ENGINE= MyISAM;
|
|
SET SQL_LOG_BIN= 1;
|
|
connection slave;
|
|
CREATE TABLE t1 (`a` INT, `b` BIT DEFAULT b'01', `c` BIT DEFAULT NULL,
|
|
PRIMARY KEY (`a`)) ENGINE= MyISAM;
|
|
************* EXECUTION WITH INSERTS *************
|
|
connection master;
|
|
INSERT INTO t1(a,b,c) VALUES (1, null, b'01');
|
|
INSERT INTO t1(a,b,c) VALUES (2,b'00', b'01');
|
|
INSERT INTO t1(a,b) VALUES (3, null);
|
|
INSERT INTO t1(a,c) VALUES (4, b'01');
|
|
INSERT INTO t1(a) VALUES (5);
|
|
************* SHOWING THE RESULT SETS WITH INSERTS *************
|
|
TABLES t1 and t2 must be different.
|
|
connection slave;
|
|
connection master;
|
|
SELECT a,b+0,c+0 FROM t1 ORDER BY a;
|
|
a b+0 c+0
|
|
1 NULL 1
|
|
2 0 1
|
|
3 NULL NULL
|
|
4 NULL 1
|
|
5 NULL NULL
|
|
connection slave;
|
|
SELECT a,b+0,c+0 FROM t1 ORDER BY a;
|
|
a b+0 c+0
|
|
1 NULL 1
|
|
2 0 1
|
|
3 NULL NULL
|
|
4 NULL 1
|
|
5 NULL NULL
|
|
************* EXECUTION WITH UPDATES and REPLACES *************
|
|
connection master;
|
|
DELETE FROM t1;
|
|
INSERT INTO t1(a,b,c) VALUES (1,b'00', b'01');
|
|
REPLACE INTO t1(a,b,c) VALUES (2,b'00',b'01');
|
|
UPDATE t1 set b= NULL, c= b'00' where a= 1;
|
|
REPLACE INTO t1(a,b,c) VALUES (2, NULL, b'00');
|
|
************* SHOWING THE RESULT SETS WITH UPDATES and REPLACES *************
|
|
TABLES t1 and t2 must be equal otherwise an error will be thrown.
|
|
connection slave;
|
|
include/diff_tables.inc [master:t1, slave:t1]
|
|
connection master;
|
|
DROP TABLE t1;
|
|
connection slave;
|
|
################################################################################
|
|
# NULL ---> NOT NULL (STRICT MODE)
|
|
# UNCOMMENT THIS AFTER FIXING BUG#43992
|
|
################################################################################
|
|
################################################################################
|
|
# NULL ---> NOT NULL (NON-STRICT MODE)
|
|
################################################################################
|
|
connection master;
|
|
SET SQL_LOG_BIN= 0;
|
|
CREATE TABLE t1(`a` INT NOT NULL, `b` INT,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t2(`a` INT NOT NULL, `b` INT,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t3(`a` INT NOT NULL, `b` INT,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
SET SQL_LOG_BIN= 1;
|
|
connection slave;
|
|
CREATE TABLE t1(`a` INT NOT NULL, `b` INT NOT NULL,
|
|
`c` INT NOT NULL,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t2(`a` INT NOT NULL, `b` INT NOT NULL,
|
|
`c` INT,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
CREATE TABLE t3(`a` INT NOT NULL, `b` INT NOT NULL,
|
|
`c` INT DEFAULT 500,
|
|
PRIMARY KEY(`a`)) ENGINE=MyISAM DEFAULT CHARSET=LATIN1;
|
|
************* EXECUTION WITH INSERTS *************
|
|
connection master;
|
|
INSERT INTO t1(a) VALUES (1);
|
|
INSERT INTO t1(a, b) VALUES (2, NULL);
|
|
INSERT INTO t1(a, b) VALUES (3, 1);
|
|
INSERT INTO t2(a) VALUES (1);
|
|
INSERT INTO t2(a, b) VALUES (2, NULL);
|
|
INSERT INTO t2(a, b) VALUES (3, 1);
|
|
INSERT INTO t3(a) VALUES (1);
|
|
INSERT INTO t3(a, b) VALUES (2, NULL);
|
|
INSERT INTO t3(a, b) VALUES (3, 1);
|
|
INSERT INTO t3(a, b) VALUES (4, 1);
|
|
REPLACE INTO t3(a, b) VALUES (5, null);
|
|
REPLACE INTO t3(a, b) VALUES (3, null);
|
|
UPDATE t3 SET b = NULL where a = 4;
|
|
************* SHOWING THE RESULT SETS *************
|
|
connection master;
|
|
connection slave;
|
|
connection master;
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a b
|
|
1 NULL
|
|
2 NULL
|
|
3 1
|
|
connection slave;
|
|
SELECT * FROM t1 ORDER BY a;
|
|
a b c
|
|
1 0 0
|
|
2 0 0
|
|
3 1 0
|
|
connection master;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a b
|
|
1 NULL
|
|
2 NULL
|
|
3 1
|
|
connection slave;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
a b c
|
|
1 0 NULL
|
|
2 0 NULL
|
|
3 1 NULL
|
|
connection master;
|
|
SELECT * FROM t3 ORDER BY a;
|
|
a b
|
|
1 NULL
|
|
2 NULL
|
|
3 NULL
|
|
4 NULL
|
|
5 NULL
|
|
connection slave;
|
|
SELECT * FROM t3 ORDER BY a;
|
|
a b c
|
|
1 0 500
|
|
2 0 500
|
|
3 0 500
|
|
4 0 500
|
|
5 0 500
|
|
connection master;
|
|
DROP TABLE t1;
|
|
DROP TABLE t2;
|
|
DROP TABLE t3;
|
|
connection slave;
|
|
include/rpl_end.inc
|
|
set @@global.log_warnings=default;
|