ha_ndbcluster.cc:

merge error

ha_ndbcluster.cc:
merge error
fdfc7311 · tomas@poseidon.ndb.mysql.com · 2048819f · fdfc7311
Commit fdfc7311 authored Nov 19, 2004 by tomas@poseidon.ndb.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +1 -1

No files found.
--- 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 },