Bug#26898, Alter table to empty merge from ndb causes mysqld to crash

9734a8ea · Justin.He/justin.he@dev3-240.dev.cn.tlan · 1bcac85f · 9734a8ea
Commit 9734a8ea authored Mar 28, 2007 by Justin.He/justin.he@dev3-240.dev.cn.tlan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +3 -1

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -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)
  {