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

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

Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
9532e822 · mskold/marty@quadfish.(none) · 844936ab · 4619caa5 · 9532e822
Commit 9532e822 authored Dec 07, 2007 by mskold/marty@quadfish.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +1 -1

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -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() == (int) error_data)
+            (char *) unique_index->getObjectId() == (int) error_data)
        {
          dupkey= i;
          break;