diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2010-02-12 12:12:43 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2010-02-12 12:12:43 +0800 |
| commit | 645106d2b3efbd7cd23c1172ab80e8e7b3c9c2b3 (patch) | |
| tree | f37b9a379961d5e96fe2620fb5f27cd1f792910e | |
| parent | 4480e80312754fdc2329c04291f73e3964a47526 (diff) | |
| parent | 97afccae53a5fda90311f57d328924d736279414 (diff) | |
| download | mariadb-git-645106d2b3efbd7cd23c1172ab80e8e7b3c9c2b3.tar.gz | |
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.
| -rw-r--r-- | sql/log_event.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index be167451cb3..17d7bd94d9a 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -4717,10 +4717,7 @@ int Load_log_event::do_apply_event(NET* net, Relay_log_info const *rli, thd->warning_info->opt_clear_warning_info(thd->query_id); TABLE_LIST tables; - bzero((char*) &tables,sizeof(tables)); - tables.db= thd->strmake(thd->db, thd->db_length); - tables.alias = tables.table_name = (char*) table_name; - tables.lock_type = TL_WRITE; + tables.init_one_table(thd->db, table_name, TL_WRITE); tables.updating= 1; // the table will be opened in mysql_load |