bk commit into 4.1 tree (msvensson:1.2457)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson 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.2457 05/10/28 12:26:02 msvensson@neptunus.(none) +3 -0
  MySQL Bugs: #12365: can't create tables when mysqld runs with ndbcluster option

  mysql-test/t/ndb_stopped.test
    1.1 05/10/28 12:25:30 msvensson@neptunus.(none) +37 -0
    New BitKeeper file ``mysql-test/t/ndb_stopped.test''

  mysql-test/r/ndb_stopped.result
    1.1 05/10/28 12:25:30 msvensson@neptunus.(none) +18 -0
    New BitKeeper file ``mysql-test/r/ndb_stopped.result''

  sql/ha_ndbcluster.cc
    1.174 05/10/28 12:25:30 msvensson@neptunus.(none) +6 -0
    If cluster can't be contacted print warning but return 0 to indicate that the table
does not exist. 

  mysql-test/t/ndb_stopped.test
    1.0 05/10/28 12:25:30 msvensson@neptunus.(none) +0 -0
    BitKeeper file
/home/msvensson/mysql/bug12365/my41-bug12365/mysql-test/t/ndb_stopped.test

  mysql-test/r/ndb_stopped.result
    1.0 05/10/28 12:25:30 msvensson@neptunus.(none) +0 -0
    BitKeeper file
/home/msvensson/mysql/bug12365/my41-bug12365/mysql-test/r/ndb_stopped.result

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug12365/my41-bug12365

--- 1.173/sql/ha_ndbcluster.cc	2005-10-14 11:22:51 +02:00
+++ 1.174/sql/ha_ndbcluster.cc	2005-10-28 12:25:30 +02:00
@@ -4348,6 +4348,12 @@
     const NdbError err= dict->getNdbError();
     if (err.code == 709)
       DBUG_RETURN(0);
+    if (err.code == 4009)
+    {
+      /* Cluster not connected, push warning but return table does not exist */
+      ndb_to_mysql_error(&err);
+      DBUG_RETURN(0);
+    }
     ERR_RETURN(err);
   }
   
--- New file ---
+++ mysql-test/r/ndb_stopped.result	05/10/28 12:25:30
drop table if exists t1;
Connected to Management Server at: localhost:9350
Executing RESTART on all nodes.
Starting shutdown. This may take a while. Please wait...
NDB Cluster is being restarted.
Trying to start all nodes of system.
Use ALL STATUS to see the system start-up phases.

create table t1(a int) engine=myisam;
Warnings:
Error	1296	Got error 4009 'Cluster Failure' from NDB
create table t1(a int) engine=ndb;
ERROR 42S01: Table 't1' already exists
Connected to Management Server at: localhost:9350
NDB Cluster is being started.
NDB Cluster is being started.

drop table if exists t1;

--- New file ---
+++ mysql-test/t/ndb_stopped.test	05/10/28 12:25:30
-- source include/have_ndb.inc
-- source include/not_embedded.inc

--disable_warnings
drop table if exists t1;
--enable_warnings

###########################
# Test MySQL Server without connection to Cluster
#


#
# Stop NDB, ie. restart and enter "nostart" 
#
--exec $NDB_MGM -e "all restart -n"
--sleep 5
#
# Create a table in another engine
#

create table t1(a int) engine=myisam;

#
# Try to create a table in NDB, should not work
#
--error 1050
create table t1(a int) engine=ndb;


#
# Start NDB again
#
--exec $NDB_MGM -e "all start"
--sleep 5

drop table if exists t1;