From: Date: April 19 2006 5:00pm
Subject: bk commit into 5.0 tree (stewart:1.2164) BUG#19198
List-Archive: http://lists.mysql.com/commits/5147
X-Bug: 19198
Message-Id: <20060419150024.2B081140F8BD@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart 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.2164 06/04/20 01:00:17 stewart@stripped +1 -0
  BUG#19198 mysqld failure during DBT2
  
  crash of mysqld due to null tOp in
  NdbTransaction::getNdbIndexScanOperation(NdbIndexImpl*,NdbTableImpl*)

  ndb/src/ndbapi/NdbTransaction.cpp
    1.49 06/04/20 01:00:11 stewart@stripped +2 -2
    tOp could be null, don't fiddle with it if it is.

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/bug19198

--- 1.48/ndb/src/ndbapi/NdbTransaction.cpp	2006-03-25 00:21:41 +11:00
+++ 1.49/ndb/src/ndbapi/NdbTransaction.cpp	2006-04-20 01:00:11 +10:00
@@ -1170,9 +1170,9 @@
       if(tOp)
       {
 	tOp->m_currentTable = table;
+        // Mark that this really an NdbIndexScanOperation
+        tOp->m_type = NdbOperation::OrderedIndexScan;
       }
-      // Mark that this really an NdbIndexScanOperation
-      tOp->m_type = NdbOperation::OrderedIndexScan; 
       return tOp;
     } else {
       setOperationErrorCodeAbort(4271);