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-17 10:20:25+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/handler.cc@stripped, 2007-01-17 10:20:24+08:00, gni@stripped +3 -1
    when error code is returned by storage engine, we assume that the table is
non-existed. This can make the storage engine itself to deal with it.

# 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.217/sql/handler.cc	2007-01-17 10:20:31 +08:00
+++ 1.218/sql/handler.cc	2007-01-17 10:20:31 +08:00
@@ -2424,8 +2424,10 @@
   DBUG_ENTER("ha_table_exists_in_engine");
   DBUG_PRINT("enter", ("db: %s, name: %s", db, name));
 #ifdef HAVE_NDBCLUSTER_DB
-  if (have_ndbcluster == SHOW_OPTION_YES)
+  if (have_ndbcluster == SHOW_OPTION_YES){
     error= ndbcluster_table_exists_in_engine(thd, db, name);
+    if ( error != 1 ) error = 0;
+  } 
 #endif
   DBUG_PRINT("exit", ("error: %d", error));
   DBUG_RETURN(error);