bk commit into 5.1 tree (monty:1.2223)

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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
  1.2223 06/06/29 23:22:55 monty@stripped +1 -0
  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
    1.341 06/06/29 23:22:52 monty@stripped +9 -1
    Replaced assert with argument checking, as rpl_ndb_UUID failed on x64

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.340/sql/ha_ndbcluster.cc	2006-06-27 23:19:17 +03:00
+++ 1.341/sql/ha_ndbcluster.cc	2006-06-29 23:22:52 +03:00
@@ -4667,7 +4667,15 @@
   // reset at return
   m_table= ndbtab_g.get_table();
   // 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", 
                       m_dbname, m_tabname));