Commit d6407c76 authored by unknown's avatar unknown
Browse files

ha_ndbcluster.cc: 

  merge error


sql/ha_ndbcluster.cc:
  merge error
parent 5381a881

sql/ha_ndbcluster.cc

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 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_UNIQUE, 0 },

  { 893, HA_ERR_FOUND_DUPP_KEY, 0 },

  { 721, HA_ERR_TABLE_EXIST, 1 },

  { 4244, HA_ERR_TABLE_EXIST, 1 },