bk commit into 5.1 tree (mskold:1.2568)

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@1.2568, 2007-08-31 11:33:44+02:00, mskold@mysql.com +1 -0   Moved DBUG_ASSERT after mutex is locked

  sql/ha_ndbcluster_binlog.cc@1.131, 2007-08-31 11:33:20+02:00, mskold@mysql.com +3 -3     Moved DBUG_ASSERT after mutex is locked

diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc

--- a/sql/ha_ndbcluster_binlog.cc	2007-08-29 12:38:41 +02:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-08-31 11:33:20 +02:00
@@ -4732,15 +4732,15 @@ err:
                          op->getEvent()->getName()));
       Ndb_event_data *event_data= (Ndb_event_data *) op->getCustomData();
       NDB_SHARE *share= (event_data)?event_data->share:NULL;

-      DBUG_ASSERT(share != 0);
-      DBUG_ASSERT(share->op == op ||
-                  ndb_is_old_event_op(share, op));

       if (event_data)
       {
         delete event_data;
         op->setCustomData(NULL);
       }
+      DBUG_ASSERT(share != 0);
       (void) pthread_mutex_lock(&share->mutex);
+      DBUG_ASSERT(share->op == op ||
+                  ndb_is_old_event_op(share, op));
       share->op= 0;
       ndb_remove_old_event_op(share, op);
       (void) pthread_mutex_unlock(&share->mutex);

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com