bk commit into 5.0 tree (gni:1.2259) BUG#18676

[gni]

Below is the list of changes that have just been committed into a local
5.0 repository of root. When root 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@stripped, 2007-01-26 14:37:31+08:00, gni@stripped +1 -0
  BUG#18676 when cluster stoage engine is down, mysqld can't normally create talbe with
other storage engine. 

  sql/ha_ndbcluster.cc@stripped, 2007-01-26 14:37:29+08:00, gni@stripped +2 -1
    When ndb cluster engine error happens, it prints out the error information and return
0 which means the table non-exist.

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.0/bug18676

--- 1.279/sql/ha_ndbcluster.cc	2007-01-26 14:37:36 +08:00
+++ 1.280/sql/ha_ndbcluster.cc	2007-01-26 14:37:36 +08:00
@@ -4912,7 +4912,8 @@
     const NdbError err= dict->getNdbError();
     if (err.code == 709)
       DBUG_RETURN(0);
-    ERR_RETURN(err);
+    ERR_PRINT(err);
+    DBUG_RETURN(0); 
   }
 
   DBUG_PRINT("info", ("Found table %s", tab->getName()));