bk commit into 5.1 tree (Justin.He:1.2486) BUG#26898

[justin.he]

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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-03-28 10:32:06+08:00, Justin.He@stripped +1 -0
  Bug#26898, Alter table to empty merge from ndb causes mysqld to crash

  sql/ha_ndbcluster.cc@stripped, 2007-03-28 10:32:03+08:00, Justin.He@stripped +3 -1
    remove the assertion, when trans is NULL, return 0 directly since the transaction is 
    possibly released in ha_ndbcluster::external_lock(...) function

# 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:	Justin.He
# Host:	dev3-240.dev.cn.tlan
# Root:	/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj

--- 1.421/sql/ha_ndbcluster.cc	2007-03-28 10:32:16 +08:00
+++ 1.422/sql/ha_ndbcluster.cc	2007-03-28 10:32:16 +08:00
@@ -4366,7 +4366,9 @@
   DBUG_PRINT("transaction",("%s",
                             trans == thd_ndb->stmt ?
                             "stmt" : "all"));
-  DBUG_ASSERT(ndb && trans);
+  DBUG_ASSERT(ndb);
+  if (trans == NULL)
+    DBUG_RETURN(0);
 
   if (execute_commit(thd,trans) != 0)
   {