diff options
| author | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-16 11:12:05 +0800 |
|---|---|---|
| committer | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-08-16 11:12:05 +0800 |
| commit | 9e46c67b29468cb4104a4fafbca5b155f7701a1f (patch) | |
| tree | 39ad3d88b95bbb805681936e903e59d94649376f /sql/ha_ndbcluster.cc | |
| parent | b0ac87dc443f4b7b704d49f906f7673562541352 (diff) | |
| parent | 9e8327a6a0753175afd96ddf5698e3338e91598d (diff) | |
| download | mariadb-git-9e46c67b29468cb4104a4fafbca5b155f7701a1f.tar.gz | |
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 4d02c8267db..7a291276095 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -229,14 +229,12 @@ static int ndb_to_mysql_error(const NdbError *ndberr) */ case HA_ERR_NO_SUCH_TABLE: case HA_ERR_KEY_NOT_FOUND: - case HA_ERR_FOUND_DUPP_KEY: return error; /* Mapping missing, go with the ndb error code*/ case -1: error= ndberr->code; break; - /* Mapping exists, go with the mapped code */ default: break; |