Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-maint2

mysql-test/suite/rpl/r/rpl_temporary.result

@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032");
 reset master;
 SET @save_select_limit=@@session.sql_select_limit;
 SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100;

mysql-test/suite/rpl/t/rpl_temporary.test

@@ -16,6 +16,10 @@ source include/add_anonymous_users.inc;
 # (otherwise RESET MASTER may come too early).
 save_master_pos;
 connection slave;
+
+# Add supression for expected warning(s) in slaves error log
+call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032");
+
 sync_with_master;
 reset master;
 connection master;

storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

@@ -551,7 +551,7 @@ Dbtc::execDROP_TAB_REQ(Signal* signal)
   Uint32 senderRef = req->senderRef;
   Uint32 senderData = req->senderData;
   DropTabReq::RequestType rt = (DropTabReq::RequestType)req->requestType;
-  
+  abort();  
   if(!tabPtr.p->get_enabled() && rt == DropTabReq::OnlineDropTab){
     jam();
     DropTabRef* ref = (DropTabRef*)signal->getDataPtrSend();