bk commit into 5.1 tree (tulin:1.1877)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1877 05/05/25 09:01:05 tulin@stripped +6 -0
  Many files:
    merge

  storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.34 05/05/25 08:56:15 ndbdev@stripped +0 -5
    merge

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.87 05/05/25 08:56:15 ndbdev@stripped +0 -1
    merge

  storage/ndb/src/ndbapi/Ndb.cpp
    1.62 05/05/25 08:56:15 ndbdev@stripped +1 -2
    merge

  sql/sql_class.cc
    1.192 05/05/25 08:56:15 ndbdev@stripped +1 -1
    merge

  sql/log_event.cc
    1.196 05/05/25 08:56:15 ndbdev@stripped +6 -2
    merge

  sql/ha_ndbcluster.cc
    1.256 05/05/25 08:56:15 ndbdev@stripped +2 -2
    merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-5.1-wl2325

--- 1.195/sql/log_event.cc	Tue May 24 15:08:01 2005
+++ 1.196/sql/log_event.cc	Wed May 25 08:56:15 2005
@@ -5013,15 +5013,17 @@
   DBUG_ASSERT(record && row);
 
   Field **p_field= table->field, *field= *p_field;
+  MY_BITMAP *write_set= table->file->write_set;
   int n_null_bytes= table->s->null_bytes;
   ptrdiff_t const offset= record - (byte*) table->record[0];
 
   memcpy(record, row, n_null_bytes);
   char const* ptr= row+n_null_bytes;
 
+  bitmap_set_all(write_set);
   for (size_t i= 0 ; field ; i++, p_field++, field= *p_field)
   {
-    if (bitmap_fast_is_set(cols,i))
+    if (bitmap_is_set(cols,i))
     {
       DBUG_PRINT("info", ("Unpacking length %d field '%s' from %p to %p + %d",
 			  field->field_length, 
@@ -5029,6 +5031,8 @@
 			  ptr, record,field->ptr + offset - record));    
       ptr= field->unpack(field->ptr + offset, ptr);
     }
+    else
+      bitmap_clear_bit(write_set, i+1);
   }
   DBUG_PRINT("return", ("ptr=%p", ptr));
   DBUG_RETURN(ptr);
@@ -5055,7 +5059,7 @@
   {
     // ULONG_MAX is used to flag fields that are not used and whose value
     // should be ignored. This is similar to how InnoDB flags the fields.
-    table->field[i]->query_id= bitmap_fast_is_set(cols,i) ? thd->query_id :
ULONG_MAX;
+    table->field[i]->query_id= bitmap_is_set(cols,i) ? thd->query_id :
ULONG_MAX;
     DBUG_PRINT("info", ("Query id for field '%s' is %lu",
 			table->field[i]->field_name,
 			table->field[i]->query_id));    

--- 1.191/sql/sql_class.cc	Tue May 24 16:33:13 2005
+++ 1.192/sql/sql_class.cc	Wed May 25 08:56:15 2005
@@ -2082,7 +2082,7 @@
 
   for (int i= 0 ; field ; i++, p_field++, field= *p_field)
   {
-    if (bitmap_fast_is_set(cols,i))
+    if (bitmap_is_set(cols,i))
     {
       ptr= field->pack(ptr, field->ptr + offset);
       DBUG_PRINT("info", ("Packing length %d field '%s' (%s) from "

--- 1.61/storage/ndb/src/ndbapi/Ndb.cpp	Tue May 24 16:33:17 2005
+++ 1.62/storage/ndb/src/ndbapi/Ndb.cpp	Wed May 25 08:56:15 2005
@@ -231,10 +231,9 @@
 void 
 Ndb::doDisconnect()
 {
+  DBUG_ENTER("Ndb::doDisconnect");
   NdbTransaction* tNdbCon;
   CHECK_STATUS_MACRO_VOID;
-  /* DBUG_ENTER must be after CHECK_STATUS_MACRO_VOID because of 'return' */
-  DBUG_ENTER("Ndb::doDisconnect");
 
   Uint32 tNoOfDbNodes = theImpl->theNoOfDBnodes;
   Uint8 *theDBnodes= theImpl->theDBnodes;

--- 1.86/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	Tue May 24 16:38:51 2005
+++ 1.87/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	Wed May 25 08:56:15 2005
@@ -619,7 +619,6 @@
   mi_type= 0;
   m_dur= NdbDictionary::Event::ED_UNDEFINED;
   m_tableImpl= NULL;
-  m_bufferId= RNIL;
 }
 
 NdbEventImpl::~NdbEventImpl()

--- 1.255/sql/ha_ndbcluster.cc	Tue May 24 16:38:51 2005
+++ 1.256/sql/ha_ndbcluster.cc	Wed May 25 08:56:15 2005
@@ -2156,7 +2156,7 @@
   {
     Field *field= table->field[i];
     if (!(field->flags & PRI_KEY_FLAG) &&
-	((thd->query_id == field->query_id || m_retrieve_all_fields ) || !m_use_write)
&&
+	(ha_get_bit_in_write_set(i+1) || !m_use_write) &&
         set_ndb_value(op, field, i, record-table->record[0], &set_blob_value))
     {
       m_skip_auto_increment= TRUE;
@@ -2512,7 +2512,7 @@
 	  {
 	    DBUG_PRINT("info",("[%u] UNDEFINED",
 			       (*value).rec->getColumn()->getColumnNo()));
-            bitmap_fast_clear_bit(defined,
(*value).rec->getColumn()->getColumnNo());
+            bitmap_clear_bit(defined, (*value).rec->getColumn()->getColumnNo());
 	  }
 	}
         else if (field->type() == MYSQL_TYPE_BIT)

--- 1.33/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	Tue May 24 16:38:51 2005
+++ 1.34/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	Wed May 25 08:56:15 2005
@@ -308,11 +308,6 @@
     delete m_config_retriever;
     m_config_retriever= NULL;
   }
-  if (ndb_global_event_buffer_mutex != NULL)
-  {
-    NdbMutex_Destroy(ndb_global_event_buffer_mutex);
-    ndb_global_event_buffer_mutex= NULL;
-  }
 #ifdef VM_TRACE
   if (ndb_print_state_mutex != NULL)
   {