diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-19 09:27:16 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-19 09:27:16 +0000 |
| commit | d6407c760e753fb53bfaa1ad5b3174d424edffd9 (patch) | |
| tree | 6dae34fa7f01ad37959048cdc06cfbce0d044b58 | |
| parent | 5381a881e1685e5f7218aa7486ed7f7c661bb3d9 (diff) | |
| download | mariadb-git-d6407c760e753fb53bfaa1ad5b3174d424edffd9.tar.gz | |
ha_ndbcluster.cc:
merge error
sql/ha_ndbcluster.cc:
merge error
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 }, |