bk commit into 5.1 tree (mskold:1.2617)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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@stripped, 2007-08-29 12:06:28+02:00, mskold@stripped +2 -0
  WL3680 On-line add attribute, ndbcluster handler part: Moved record[] from NDB_SHARE to Ndb_event_data so each NdbEventOperation have dedicated buffers, post-review fixes

  sql/ha_ndbcluster.cc@stripped, 2007-08-29 12:05:22+02:00, mskold@stripped +1 -3
    WL3680 On-line add attribute, ndbcluster handler part: Moved record[] from NDB_SHARE to Ndb_event_data so each NdbEventOperation have dedicated buffers, post-review fixes

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-08-29 12:05:22+02:00, mskold@stripped +4 -5
    WL3680 On-line add attribute, ndbcluster handler part: Moved record[] from NDB_SHARE to Ndb_event_data so each NdbEventOperation have dedicated buffers, post-review fixes

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-telco-6.2

--- 1.491/sql/ha_ndbcluster.cc	2007-08-29 12:06:55 +02:00
+++ 1.492/sql/ha_ndbcluster.cc	2007-08-29 12:06:55 +02:00
@@ -8995,9 +8995,9 @@ void ndbcluster_real_free_share(NDB_SHAR
 
   hash_delete(&ndbcluster_open_tables, (byte*) *share);
   thr_lock_delete(&(*share)->lock);
+  pthread_mutex_destroy(&(*share)->mutex);
 
 #ifdef HAVE_NDB_BINLOG
-  (void) pthread_mutex_lock(&(*share)->mutex);
   if ((*share)->table)
   {
     // (*share)->table->mem_root is freed by closefrm
@@ -9021,9 +9021,7 @@ void ndbcluster_real_free_share(NDB_SHAR
     (*share)->table= 0;
 #endif
   }
-  (void) pthread_mutex_unlock(&(*share)->mutex);
 #endif
-  pthread_mutex_destroy(&(*share)->mutex);
   free_root(&(*share)->mem_root, MYF(0));
   my_free((gptr) *share, MYF(0));
   *share= 0;

--- 1.131/sql/ha_ndbcluster_binlog.cc	2007-08-29 12:06:55 +02:00
+++ 1.132/sql/ha_ndbcluster_binlog.cc	2007-08-29 12:06:55 +02:00
@@ -1625,7 +1625,6 @@ ndb_remove_old_event_op(NDB_SHARE *share
 void
 ndb_remove_old_event_ops(NDB_SHARE *share)
 {
-  safe_mutex_assert_owner(&share->mutex);
   List_iterator<NdbEventOperation> it(share->old_ops);
   NdbEventOperation *op;
   if (share->old_ops.is_empty())
@@ -3847,7 +3846,7 @@ ndb_binlog_thread_handle_data_event(Ndb 
 
       if (share->flags & NSF_BLOB_FLAG)
       {
-        my_ptrdiff_t ptrdiff= event_data->record[n] - event_data->record[0];
+        my_ptrdiff_t ptrdiff= event_data->record[n] - table->record[0];
         IF_DBUG(int ret =) get_ndb_blobs_value(table, event_data->ndb_value[n],
                                                blobs_buffer[n],
                                                blobs_buffer_size[n],
@@ -3898,7 +3897,7 @@ ndb_binlog_thread_handle_data_event(Ndb 
         */
         if (share->flags & NSF_BLOB_FLAG)
         {
-          my_ptrdiff_t ptrdiff= event_data->record[1] - event_data->record[0];
+          my_ptrdiff_t ptrdiff= event_data->record[1] - table->record[0];
           IF_DBUG(int ret =) get_ndb_blobs_value(table, event_data->ndb_value[1],
                                                  blobs_buffer[1],
                                                  blobs_buffer_size[1],
@@ -4717,11 +4716,11 @@ err:
       (void) pthread_mutex_lock(&share->mutex);
       share->op= 0;
       ndb_remove_old_event_op(share, op);
+      (void) pthread_mutex_unlock(&share->mutex);
       /* ndb_share reference binlog free */
       DBUG_PRINT("NDB_SHARE", ("%s binlog free  use_count: %u",
                                share->key, share->use_count));
       free_share(&share);
-      (void) pthread_mutex_unlock(&share->mutex);
       s_ndb->dropEventOperation(op);
     }
     delete s_ndb;
@@ -4749,11 +4748,11 @@ err:
       (void) pthread_mutex_lock(&share->mutex);
       share->op= 0;
       ndb_remove_old_event_op(share, op);
+      (void) pthread_mutex_unlock(&share->mutex);
       /* ndb_share reference binlog free */
       DBUG_PRINT("NDB_SHARE", ("%s binlog free  use_count: %u",
                                share->key, share->use_count));
       free_share(&share);
-      (void) pthread_mutex_unlock(&share->mutex);
       i_ndb->dropEventOperation(op);
     }
     delete i_ndb;