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 15:50:09 monty@stripped +2 -0
  Replaced assert with argument checking, as rpl_ndb_UUID failed on x64
  Fixed that mysqlmanager when running from mysql-test-run doesn't use external option files

  sql/ha_ndbcluster.cc
    1.341 06/06/29 15:50:05 monty@stripped +7 -1
    Replaced assert with argument checking, as rpl_ndb_UUID failed on x64

  mysql-test/mysql-test-run.pl
    1.128 06/06/29 15:50:05 monty@stripped +1 -0
    Add --no-defaults to mysqlmanager, to not have it confused by any not related my.cnf files

# 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.127/mysql-test/mysql-test-run.pl	2006-06-20 17:22:46 +03:00
+++ 1.128/mysql-test/mysql-test-run.pl	2006-06-29 15:50:05 +03:00
@@ -3033,6 +3033,7 @@
 
   my $args;
   mtr_init_args(\$args);
+  mtr_add_arg($args, "--no-defaults");
   mtr_add_arg($args, "--defaults-file=%s",
               $instance_manager->{'defaults_file'});
 

--- 1.340/sql/ha_ndbcluster.cc	2006-06-27 23:19:17 +03:00
+++ 1.341/sql/ha_ndbcluster.cc	2006-06-29 15:50:05 +03:00
@@ -4667,7 +4667,13 @@
   // 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)
+  {
+    const NdbError err= dict->getNdbError();
+    ERR_PRINT(err);
+    my_errno= ndb_to_mysql_error(&err);
+    DBUG_RETURN(my_errno);
+  }
 
   DBUG_PRINT("info", ("Table %s/%s created successfully", 
                       m_dbname, m_tabname));