Commit 7b15f347 authored by gni@dev3-221.dev.cn.tlan's avatar gni@dev3-221.dev.cn.tlan
Browse files

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
parents 17c3b8d5 ad6defd4

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -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 },