Skip to content

Commit 6bad457

Browse files
authored andcommitted
Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with
--slave-load-tm The MDL_SHARED lock was introduced for an object in 5.4, but the 'TABLE_LIST' object was not initialized with the MDL_SHARED lock when applying event with LOAD DATA INFILE into table. So the failure is caused when checking the MDL_SHARED lock for the object. To fix the problem, the 'TABLE_LIST' object was initialized with the MDL_SHARED lock when applying event with LOAD DATA INFILE into table.
1 parent 5f2c8ca commit 6bad457

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

mysql-test/suite/rpl/t/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212

1313
rpl_get_master_version_and_clock: # Bug#46931 2009-10-17 joro rpl.rpl_get_master_version_and_clock fails
1414
rpl_row_create_table : Bug#45576 2009-12-01 joro rpl_row_create_table fails on PB2
15-
rpl_cross_version : BUG#43913 2009-10-22 luis rpl_cross_version fails with symptom in described in bug report
1615
rpl_spec_variables : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQL_TMP_DIR
1+
--replicate-same-server-id --relay-log=slave-relay-bin

sql/log_event.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4634,10 +4634,7 @@ int Load_log_event::do_apply_event(NET* net, Relay_log_info const *rli,
46344634
thd->warning_info->opt_clear_warning_info(thd->query_id);
46354635

46364636
TABLE_LIST tables;
4637-
bzero((char*) &tables,sizeof(tables));
4638-
tables.db= thd->strmake(thd->db, thd->db_length);
4639-
tables.alias = tables.table_name = (char*) table_name;
4640-
tables.lock_type = TL_WRITE;
4637+
tables.init_one_table(thd->db, table_name, TL_WRITE);
46414638
tables.updating= 1;
46424639

46434640
// the table will be opened in mysql_load

0 commit comments

Comments
 (0)