bk commit into 5.0 tree (gni:1.2512) BUG#28423

[gni]

Below is the list of changes that have just been committed into a local
5.0 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-07-25 09:32:28+08:00, gni@stripped +1 -0
  BUG#28423 cluster to storage engine error code mapping problem

  sql/ha_ndbcluster.cc@stripped, 2007-07-25 09:32:26+08:00, gni@stripped +2 -2
    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

# 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/bug28423

--- 1.315/sql/ha_ndbcluster.cc	2007-07-25 09:32:34 +08:00
+++ 1.316/sql/ha_ndbcluster.cc	2007-07-25 09:32:34 +08:00
@@ -181,8 +181,8 @@
 static const err_code_mapping err_map[]= 
 {
   { 626, HA_ERR_KEY_NOT_FOUND, 0 },
-  { 630, HA_ERR_FOUND_DUPP_KEY, 0 },
-  { 893, HA_ERR_FOUND_DUPP_KEY, 0 },
+  { 630, HA_ERR_FOUND_DUPP_KEY, 1 },
+  { 893, HA_ERR_FOUND_DUPP_KEY, 1 },
   { 721, HA_ERR_TABLE_EXIST, 1 },
   { 4244, HA_ERR_TABLE_EXIST, 1 },