bzr commit into mysql-5.5-next-mr branch (Dao-Gang.Qu:2998) Bug#43913

[Dao-Gang.Qu]

#At file:///home/daogangqu/mysql/bzrwork/bug43913/mysql-next-mr-bugfixing/ based on revid:magne.mahre@stripped

 2998 Dao-Gang.Qu@stripped	2010-02-12 [merge]
      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.

    modified:
      sql/log_event.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2010-01-30 22:10:29 +0000
+++ b/sql/log_event.cc	2010-02-12 04:12:43 +0000
@@ -4717,10 +4717,7 @@ int Load_log_event::do_apply_event(NET* 
     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    


Attachment: [text/bzr-bundle] bzr/[e-mail]