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

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
7b15f347 · gni@dev3-221.dev.cn.tlan · 17c3b8d5 · ad6defd4 · 7b15f347
Commit 7b15f347 authored Aug 08, 2007 by gni@dev3-221.dev.cn.tlan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +2 -2

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