mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb

Browse source 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Merge
This commit is contained in:
unknown 2007-12-07 13:45:01 +01:00
commit e7af30694a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/ha_ndbcluster.cc
View file

@ -588,7 +588,7 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans)
err.code, res)); err.code, res));
if (res == HA_ERR_FOUND_DUPP_KEY) if (res == HA_ERR_FOUND_DUPP_KEY)
{ {
uint error_data= (uint) err.details; char *error_data= err.details;
uint dupkey= MAX_KEY; uint dupkey= MAX_KEY;
for (uint i= 0; i < MAX_KEY; i++) for (uint i= 0; i < MAX_KEY; i++)
@ -599,7 +599,7 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans)
const NDBINDEX *unique_index= const NDBINDEX *unique_index=
(const NDBINDEX *) m_index[i].unique_index; (const NDBINDEX *) m_index[i].unique_index;
if (unique_index && if (unique_index &&
(uint) unique_index->getObjectId() == error_data) (uint) unique_index->getObjectId() == (int) error_data)
{ {
dupkey= i; dupkey= i;
break; break;