merge 10.0 -> 10.1 to resolve MDEV-17803 conflicts.
This commit is contained in:
parent
c2a4bfad22
commit
b22354680e
29
mysql-test/suite/rpl/r/rpl_row_big_table_id,32bit.rdiff
Normal file
29
mysql-test/suite/rpl/r/rpl_row_big_table_id,32bit.rdiff
Normal file
@ -0,0 +1,29 @@
|
||||
--- r/rpl_row_big_table_id.result 2019-01-23 19:58:07.204914873 +0200
|
||||
+++ r/rpl_row_big_table_id_32bit.result 2019-01-23 19:43:54.590640934 +0200
|
||||
@@ -19,20 +19,20 @@
|
||||
master-bin.000002 # Gtid 1 # GTID #-#-#
|
||||
master-bin.000002 # Query 1 # use `test`; ALTER TABLE t comment ''
|
||||
master-bin.000002 # Gtid 1 # BEGIN GTID #-#-#
|
||||
-master-bin.000002 # Table_map 1 # table_id: 4294967295 (test.t)
|
||||
-master-bin.000002 # Write_rows_v1 1 # table_id: 4294967295 flags: STMT_END_F
|
||||
+master-bin.000002 # Table_map 1 # table_id: 1 (test.t)
|
||||
+master-bin.000002 # Write_rows_v1 1 # table_id: 1 flags: STMT_END_F
|
||||
master-bin.000002 # Query 1 # COMMIT
|
||||
master-bin.000002 # Gtid 1 # GTID #-#-#
|
||||
master-bin.000002 # Query 1 # use `test`; ALTER TABLE t comment ''
|
||||
master-bin.000002 # Gtid 1 # BEGIN GTID #-#-#
|
||||
-master-bin.000002 # Table_map 1 # table_id: 4294967296 (test.t)
|
||||
-master-bin.000002 # Write_rows_v1 1 # table_id: 4294967296 flags: STMT_END_F
|
||||
+master-bin.000002 # Table_map 1 # table_id: 2 (test.t)
|
||||
+master-bin.000002 # Write_rows_v1 1 # table_id: 2 flags: STMT_END_F
|
||||
master-bin.000002 # Query 1 # COMMIT
|
||||
master-bin.000002 # Gtid 1 # GTID #-#-#
|
||||
master-bin.000002 # Query 1 # use `test`; ALTER TABLE t comment ''
|
||||
master-bin.000002 # Gtid 1 # BEGIN GTID #-#-#
|
||||
-master-bin.000002 # Table_map 1 # table_id: 4294967297 (test.t)
|
||||
-master-bin.000002 # Write_rows_v1 1 # table_id: 4294967297 flags: STMT_END_F
|
||||
+master-bin.000002 # Table_map 1 # table_id: 3 (test.t)
|
||||
+master-bin.000002 # Write_rows_v1 1 # table_id: 3 flags: STMT_END_F
|
||||
master-bin.000002 # Query 1 # COMMIT
|
||||
DROP TABLE t;
|
||||
include/rpl_end.inc
|
38
mysql-test/suite/rpl/r/rpl_row_big_table_id.result
Normal file
38
mysql-test/suite/rpl/r/rpl_row_big_table_id.result
Normal file
@ -0,0 +1,38 @@
|
||||
include/master-slave.inc
|
||||
[connection master]
|
||||
include/rpl_restart_server.inc [server_number=1]
|
||||
SET @@debug_dbug="d,simulate_big_table_id";
|
||||
CREATE TABLE t (a int);
|
||||
INSERT INTO t SET a= 0;
|
||||
ALTER TABLE t comment '';
|
||||
INSERT INTO t SET a= 1;
|
||||
ALTER TABLE t comment '';
|
||||
INSERT INTO t SET a= 2;
|
||||
ALTER TABLE t comment '';
|
||||
INSERT INTO t SET a= 3;
|
||||
show binlog events in <file> from <pos>;
|
||||
Log_name Pos Event_type Server_id End_log_pos Info
|
||||
master-bin.000002 # Gtid 1 # BEGIN GTID #-#-#
|
||||
master-bin.000002 # Table_map 1 # table_id: 4294967294 (test.t)
|
||||
master-bin.000002 # Write_rows_v1 1 # table_id: 4294967294 flags: STMT_END_F
|
||||
master-bin.000002 # Query 1 # COMMIT
|
||||
master-bin.000002 # Gtid 1 # GTID #-#-#
|
||||
master-bin.000002 # Query 1 # use `test`; ALTER TABLE t comment ''
|
||||
master-bin.000002 # Gtid 1 # BEGIN GTID #-#-#
|
||||
master-bin.000002 # Table_map 1 # table_id: 4294967295 (test.t)
|
||||
master-bin.000002 # Write_rows_v1 1 # table_id: 4294967295 flags: STMT_END_F
|
||||
master-bin.000002 # Query 1 # COMMIT
|
||||
master-bin.000002 # Gtid 1 # GTID #-#-#
|
||||
master-bin.000002 # Query 1 # use `test`; ALTER TABLE t comment ''
|
||||
master-bin.000002 # Gtid 1 # BEGIN GTID #-#-#
|
||||
master-bin.000002 # Table_map 1 # table_id: 4294967296 (test.t)
|
||||
master-bin.000002 # Write_rows_v1 1 # table_id: 4294967296 flags: STMT_END_F
|
||||
master-bin.000002 # Query 1 # COMMIT
|
||||
master-bin.000002 # Gtid 1 # GTID #-#-#
|
||||
master-bin.000002 # Query 1 # use `test`; ALTER TABLE t comment ''
|
||||
master-bin.000002 # Gtid 1 # BEGIN GTID #-#-#
|
||||
master-bin.000002 # Table_map 1 # table_id: 4294967297 (test.t)
|
||||
master-bin.000002 # Write_rows_v1 1 # table_id: 4294967297 flags: STMT_END_F
|
||||
master-bin.000002 # Query 1 # COMMIT
|
||||
DROP TABLE t;
|
||||
include/rpl_end.inc
|
57
mysql-test/suite/rpl/t/rpl_row_big_table_id.test
Normal file
57
mysql-test/suite/rpl/t/rpl_row_big_table_id.test
Normal file
@ -0,0 +1,57 @@
|
||||
##################################################################
|
||||
# rpl_row_big_table_id
|
||||
#
|
||||
# MDEV-17803 Row-based event is not applied when
|
||||
# table map id is greater 32 bit int
|
||||
#
|
||||
# Verify row-based events applying when table map id value is about and greater
|
||||
# than 1 << 32.
|
||||
##################################################################
|
||||
--source include/word_size.inc
|
||||
--source include/have_debug.inc
|
||||
--source include/have_binlog_format_row.inc
|
||||
--source include/master-slave.inc
|
||||
|
||||
--connection master
|
||||
# To reset last table id
|
||||
--let $rpl_server_number= 1
|
||||
--source include/rpl_restart_server.inc
|
||||
|
||||
SET @@debug_dbug="d,simulate_big_table_id";
|
||||
CREATE TABLE t (a int);
|
||||
|
||||
--let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
|
||||
--let $binlog_pos= query_get_value(SHOW MASTER STATUS, Position, 1)
|
||||
INSERT INTO t SET a= 0;
|
||||
ALTER TABLE t comment '';
|
||||
INSERT INTO t SET a= 1;
|
||||
ALTER TABLE t comment '';
|
||||
INSERT INTO t SET a= 2;
|
||||
ALTER TABLE t comment '';
|
||||
INSERT INTO t SET a= 3;
|
||||
|
||||
# display simulated big table_id
|
||||
--let $_in_from=in '$binlog_file' from $binlog_pos
|
||||
--replace_result "$_in_from" "in <file> from <pos>"
|
||||
--replace_column 2 # 5 #
|
||||
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/ /GTID [0-9]+-[0-9]+-[0-9]+/GTID #-#-#/
|
||||
--eval show binlog events in '$binlog_file' from $binlog_pos
|
||||
|
||||
|
||||
--sync_slave_with_master
|
||||
|
||||
if (`SELECT sum(a) != 6 FROM t`)
|
||||
{
|
||||
--echo *** unexpected result; check slave applier ***
|
||||
--die
|
||||
}
|
||||
|
||||
|
||||
# Cleanup
|
||||
|
||||
--connection master
|
||||
DROP TABLE t;
|
||||
|
||||
--sync_slave_with_master
|
||||
|
||||
--source include/rpl_end.inc
|
@ -1887,7 +1887,7 @@ struct TABLE_LIST
|
||||
/* Index names in a "... JOIN ... USE/IGNORE INDEX ..." clause. */
|
||||
List<Index_hint> *index_hints;
|
||||
TABLE *table; /* opened table */
|
||||
uint table_id; /* table id (from binlog) for opened table */
|
||||
ulonglong table_id; /* table id (from binlog) for opened table */
|
||||
/*
|
||||
select_result for derived table to pass it from table creation to table
|
||||
filling procedure
|
||||
|
@ -1134,6 +1134,9 @@ void tdc_assign_new_table_id(TABLE_SHARE *share)
|
||||
DBUG_ASSERT(share);
|
||||
DBUG_ASSERT(tdc_inited);
|
||||
|
||||
DBUG_EXECUTE_IF("simulate_big_table_id",
|
||||
if (last_table_id < UINT_MAX32)
|
||||
last_table_id= UINT_MAX32 - 1;);
|
||||
/*
|
||||
There is one reserved number that cannot be used. Remember to
|
||||
change this when 6-byte global table id's are introduced.
|
||||
@ -1141,7 +1144,7 @@ void tdc_assign_new_table_id(TABLE_SHARE *share)
|
||||
do
|
||||
{
|
||||
tid= my_atomic_add64_explicit(&last_table_id, 1, MY_MEMORY_ORDER_RELAXED);
|
||||
} while (unlikely(tid == ~0UL));
|
||||
} while (unlikely(tid == ~0UL || tid == 0));
|
||||
|
||||
share->table_map_id= tid;
|
||||
DBUG_PRINT("info", ("table_id= %lu", share->table_map_id));
|
||||
|
Loading…
x
Reference in New Issue
Block a user