bk commit into 5.1 tree (gni:1.2523)

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of gni. When gni 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-08-08 19:04:31+08:00, gni@stripped +1 -0
  Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28423
  into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28423
  MERGE: 1.1810.2962.10

  sql/ha_ndbcluster.cc@stripped, 2007-08-08 19:04:22+08:00, gni@stripped +0 -5
    make HA_ERR_FOUND_DUPP_KEY error cases throw warning like the other ambiguous engine
error codes that may be caused by multiple cluster error codes.
    MERGE: 1.175.81.5

# 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/mysql-5.1-bug28423/RESYNC

--- 1.457/sql/ha_ndbcluster.cc	2007-08-08 19:04:38 +08:00
+++ 1.458/sql/ha_ndbcluster.cc	2007-08-08 19:04:38 +08:00
@@ -229,14 +229,12 @@
     */
   case HA_ERR_NO_SUCH_TABLE:
   case HA_ERR_KEY_NOT_FOUND:
-  case HA_ERR_FOUND_DUPP_KEY:
     return error;
 
     /* Mapping missing, go with the ndb error code*/
   case -1:
     error= ndberr->code;
     break;
-
     /* Mapping exists, go with the mapped code */
   default:
     break;
@@ -248,7 +246,6 @@
     - Used by replication to see if the error was temporary
   */
   if (ndberr->status == NdbError::TemporaryError)
-    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
 			ER_GET_TEMPORARY_ERRMSG, ER(ER_GET_TEMPORARY_ERRMSG),
 			ndberr->code, ndberr->message, "NDB");
   else