ndb - fix problems introduced/discovered by XA

sql/ha_ndbcluster.cc

@@ -3400,7 +3400,12 @@ int ndbcluster_commit(THD *thd, bool all)
       ndbcluster_print_error(res, error_op);
   }
   ndb->closeTransaction(trans);
-  thd_ndb->all= thd_ndb->stmt= NULL;
+  
+  if(all)
+    thd_ndb->all= NULL;
+  else
+    thd_ndb->stmt= NULL;
+  
   DBUG_RETURN(res);
 }
 
@@ -3432,7 +3437,12 @@ int ndbcluster_rollback(THD *thd, bool all)
       ndbcluster_print_error(res, error_op);
   }
   ndb->closeTransaction(trans);
-  thd_ndb->all= thd_ndb->stmt= NULL;
+
+  if(all)
+    thd_ndb->all= NULL;
+  else
+    thd_ndb->stmt= NULL;
+
   DBUG_RETURN(res);
 }
 

sql/handler.cc

@@ -860,6 +860,7 @@ bool mysql_xa_recover(THD *thd)
 int ha_release_temporary_latches(THD *thd)
 {
 #ifdef HAVE_INNOBASE_DB
+  if (opt_innodb)
     innobase_release_temporary_latches(thd);
 #endif
   return 0;