From 436ea25ecfed18b784b564dfb025b3e747b5672e Mon Sep 17 00:00:00 2001
From: unknown <tomas@poseidon.ndb.mysql.com>
Date: Fri, 19 Nov 2004 09:27:16 +0000
Subject: [PATCH] ha_ndbcluster.cc:   merge error

sql/ha_ndbcluster.cc:
  merge error
---
 sql/ha_ndbcluster.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index fd8660b29d2..bec4dfd9401 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -107,7 +107,7 @@ 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_UNIQUE, 0 },
+  { 893, HA_ERR_FOUND_DUPP_KEY, 0 },
   { 721, HA_ERR_TABLE_EXIST, 1 },
   { 4244, HA_ERR_TABLE_EXIST, 1 },
 
-- 
2.30.9