diff options
| author | unknown <mskold/marty@quadfish.(none)> | 2007-12-07 13:45:01 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@quadfish.(none)> | 2007-12-07 13:45:01 +0100 |
| commit | e7af30694a4c173d8f70bd612fa0355b99a21317 (patch) | |
| tree | 92589c702faa7921f642d8b3ebc71bf237807fb9 /sql/ha_ndbcluster.cc | |
| parent | 419e8cf7b2387ca4f30603ffd7cca8931abb7461 (diff) | |
| parent | 28d268086c134da75a6517a9d2d89cbc4b842444 (diff) | |
| download | mariadb-git-e7af30694a4c173d8f70bd612fa0355b99a21317.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Merge
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index a90f854f889..c6f043498b8 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -588,7 +588,7 @@ int ha_ndbcluster::ndb_err(NdbTransaction *trans) err.code, res)); if (res == HA_ERR_FOUND_DUPP_KEY) { - uint error_data= (uint) err.details; + char *error_data= err.details; uint dupkey= MAX_KEY; 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 *) m_index[i].unique_index; if (unique_index && - (uint) unique_index->getObjectId() == error_data) + (uint) unique_index->getObjectId() == (int) error_data) { dupkey= i; break; |