Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1

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

@@ -12,7 +12,6 @@
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms
-ndb_binlog_basic         : Bug #32759 2007-11-27 mats ndb_binlog_basic assert failure 'thd->transaction.stmt.modified_non_trans_table'
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events

storage/ndb/src/mgmsrv/MgmtSrvr.cpp

@@ -3010,7 +3010,6 @@ int MgmtSrvr::connect_to_self(void)
   return 0;
 }
 
-template class Vector<unsigned short>;
 template class MutexVector<unsigned short>;
 template class MutexVector<Ndb_mgmd_event_service::Event_listener>;
 template class Vector<EventSubscribeReq>;

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

@@ -792,6 +792,18 @@ NdbEventOperationImpl::receive_event()
           p = p->next();
         }
       }
+      // change the blobHandle's to refer to the new table object.
+      NdbBlob *p = theBlobList;
+      while (p)
+      {
+        int no = p->getColumn()->getColumnNo();
+        NdbColumnImpl *tAttrInfo = at->getColumn(no);
+        DBUG_PRINT("info", ("blob_handle: 0x%lx  "
+                            "switching column impl 0x%lx -> 0x%lx",
+                            (long) p, (long) p->theColumn, (long) tAttrInfo));
+        p->theColumn = tAttrInfo;
+        p = p->next();
+      }
       if (tmp_table_impl) 
         delete tmp_table_impl;
     }