diff options
| author | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-16 11:06:41 +0800 |
|---|---|---|
| committer | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-16 11:06:41 +0800 |
| commit | 7ea03f33bdcd0a3454bb37473bf754b512617806 (patch) | |
| tree | e8986cdc06dcb5f5420426235ceedf6a417c6332 /sql/ha_ndbcluster.cc | |
| parent | b76fd3ed3bdcdfa58ab1c1f9afbf844bd296e4da (diff) | |
| parent | 9b460fb47cb305fe95869e5bb842afd7657fb9cc (diff) | |
| download | mariadb-git-7ea03f33bdcd0a3454bb37473bf754b512617806.tar.gz | |
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -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 2d674d98d41..b74b04f4238 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 }, |