Commit 372f81af authored by unknown's avatar unknown

Replaced assert with argument checking, as rpl_ndb_UUID caused slave to fail on x86 64 bit

(It failed even if test was marked as skipped)



sql/ha_ndbcluster.cc:
  Replaced assert with argument checking, as rpl_ndb_UUID failed on x64
parent 0194db09
...@@ -4667,7 +4667,15 @@ int ha_ndbcluster::create(const char *name, ...@@ -4667,7 +4667,15 @@ int ha_ndbcluster::create(const char *name,
// reset at return // reset at return
m_table= ndbtab_g.get_table(); m_table= ndbtab_g.get_table();
// TODO check also that we have the same frm... // TODO check also that we have the same frm...
DBUG_ASSERT(m_table != 0); if (!m_table)
{
/* purecov: begin deadcode */
const NdbError err= dict->getNdbError();
ERR_PRINT(err);
my_errno= ndb_to_mysql_error(&err);
DBUG_RETURN(my_errno);
/* purecov: end */
}
DBUG_PRINT("info", ("Table %s/%s created successfully", DBUG_PRINT("info", ("Table %s/%s created successfully",
m_dbname, m_tabname)); m_dbname, m_tabname));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment