bzr commit into mysql-pe branch (Dao-Gang.Qu:3605) Bug#43913

[Dao-Gang.Qu]

#At file:///home/daogangqu/mysql/bzrwork/bug43913/mysql-pe/ based on revid:luis.soares@stripped

 3605 Dao-Gang.Qu@stripped	2009-09-18
      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.
     @ mysql-test/suite/rpl/t/disabled.def
        Got rid of the line for enabling 'rpl_cross_version' test.

    modified:
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_cross_version-master.opt
      sql/log_event.cc
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2009-08-13 21:09:33 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2009-09-18 11:42:33 +0000
@@ -10,7 +10,6 @@
 #
 ##############################################################################
 
-rpl_cross_version          : BUG#42311 2009-03-27 joro rpl_cross_version fails on macosx
 rpl_heartbeat_basic        : Bug#43828 Sporadic failures (Serge.Kozlov@stripped)
 rpl_heartbeat_2slaves      : Bug#43828 Sporadic failures (Serge.Kozlov@stripped)
 rpl_failed_optimize        : WL#4284: Can't optimize table used by a pending transaction (there is metadata lock on the table).

=== modified file 'mysql-test/suite/rpl/t/rpl_cross_version-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2009-01-27 11:33:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2009-09-18 11:42:33 +0000
@@ -1 +1 @@
---replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQL_TMP_DIR
+--replicate-same-server-id --relay-log=slave-relay-bin

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2009-09-10 10:10:09 +0000
+++ b/sql/log_event.cc	2009-09-18 11:42:33 +0000
@@ -4575,10 +4575,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, thd->db_length, table_name, table_name_len, table_name, TL_WRITE); 
     tables.updating= 1;
 
     // the table will be opened in mysql_load    


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