Commit c36e06dd authored by unknown's avatar unknown
Browse files

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


sql/ha_ndbcluster.cc:
  remove the assertion, when trans is NULL, return 0 directly since the transaction is 
  possibly released in ha_ndbcluster::external_lock(...) function
parent 7af5a3e9

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)

  {