Commit 4ad8b61b authored by unknown's avatar unknown
Browse files

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj
parents 6e667aa9 4224c50c

sql/ha_ndbcluster.cc

+3 −1
Original line number Diff line number Diff line
@@ -4366,7 +4366,9 @@ static int ndbcluster_commit(handlerton *hton, THD *thd, bool all) 
  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)

  {