bk commit into 5.1 tree (gni:1.2491) BUG#18676

[gni]

Below is the list of changes that have just been committed into a local
5.1 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-04-05 17:26:07+08:00, gni@stripped +2 -0
  BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Map the 4009
ndb error code to 157 mysql error code 

  mysql-test/r/ndb_autodiscover.result@stripped, 2007-04-05 17:26:05+08:00,
gni@stripped +1 -1
    change 4009 error code to 157 

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2007-04-05 17:26:05+08:00,
gni@stripped +1 -1
    In order to have the same error code between 5.1 and 5.0 , so map 4009 ndb error code
to 157 mysqld error code

# 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.1/bug18676

--- 1.31/mysql-test/r/ndb_autodiscover.result	2007-04-05 17:26:14 +08:00
+++ 1.32/mysql-test/r/ndb_autodiscover.result	2007-04-05 17:26:14 +08:00
@@ -382,7 +382,7 @@
 select * from t1;
 a
 select * from t1;
-ERROR HY000: Can't lock file (errno: 4009)
+ERROR HY000: Can't lock file (errno: 157)
 use test;
 drop database test_only_ndb_tables;
 CREATE TABLE t9 (

--- 1.87/storage/ndb/src/ndbapi/ndberror.c	2007-04-05 17:26:14 +08:00
+++ 1.88/storage/ndb/src/ndbapi/ndberror.c	2007-04-05 17:26:14 +08:00
@@ -151,7 +151,7 @@
    */
   { 4007, DMEC, UR, "Send to ndbd node failed" },
   { 4008, DMEC, UR, "Receive from NDB failed" },
-  { 4009, DMEC, UR, "Cluster Failure" },
+  { 4009, HA_ERR_NO_CONNECTION, UR, "Cluster Failure" },
   { 4012, DMEC, UR, 
     "Request ndbd time-out, maybe due to high load or communication problems"}, 
   { 4013, DMEC, UR, "Request timed out in waiting for node failure"},