diff options
| author | unknown <gni@dev3-221.dev.cn.tlan> | 2007-08-08 19:11:19 +0800 |
|---|---|---|
| committer | unknown <gni@dev3-221.dev.cn.tlan> | 2007-08-08 19:11:19 +0800 |
| commit | c08fc3451628975ba921cbf2727284e81c938d33 (patch) | |
| tree | ffc40cdd421970b281c49763a07bd963fa2ca9db /sql | |
| parent | 07c7be24e8406c9f5257d364e2d3afd0fc2bbf1a (diff) | |
| parent | 8df3331d8a3831577ab7bc20a1e41b62abbba991 (diff) | |
| download | mariadb-git-c08fc3451628975ba921cbf2727284e81c938d33.tar.gz | |
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28423
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 357b797ec75..23e9a938d5d 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -181,8 +181,8 @@ struct err_code_mapping 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 }, |