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

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
e7af3069 · unknown · 419e8cf7 · 28d26808 · e7af3069
Commit e7af3069 authored Dec 07, 2007 by unknown
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
@@ -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;