bk commit into 4.1 tree (tomas:1.2596) BUG#25668

[tomas]

Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas 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.2596 07/01/17 14:34:44 tomas@stripped +1 -0
  Bug #25668  	ndb: mysqld may core if cluster disconnected
  -- pTrans may be NULL, remove not needed usage of handler::ndb_err

  sql/ha_ndbcluster.cc
    1.195 07/01/17 14:34:37 tomas@stripped +6 -13
    Bug #25668  	ndb: mysqld may core if cluster disconnected
    -- pTrans may be NULL, remove not needed usage of handler::ndb_err

# 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:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-4.1

--- 1.194/sql/ha_ndbcluster.cc	2006-10-25 09:24:18 +02:00
+++ 1.195/sql/ha_ndbcluster.cc	2007-01-17 14:34:37 +01:00
@@ -5371,19 +5371,6 @@
     DBUG_RETURN(0);
 
 retry:
-    if(report_error)
-    {
-      if (file)
-      {
-        reterr= file->ndb_err(pTrans);
-      }
-      else
-      {
-        const NdbError& tmp= error;
-        ERR_PRINT(tmp);
-        reterr= ndb_to_mysql_error(&tmp);
-      }
-    }
     if (pTrans)
     {
       ndb->closeTransaction(pTrans);
@@ -5393,6 +5380,12 @@
     {
       my_sleep(retry_sleep);
       continue;
+    }
+    if(report_error)
+    {
+      const NdbError& tmp= error;
+      ERR_PRINT(tmp);
+      reterr= ndb_to_mysql_error(&tmp);
     }
     break;
   } while(1);