diff options
| author | mskold/marty@quadfish.(none) <> | 2007-12-07 14:04:58 +0100 |
|---|---|---|
| committer | mskold/marty@quadfish.(none) <> | 2007-12-07 14:04:58 +0100 |
| commit | 9532e822f109476d9a674bde50972bee743ade8d (patch) | |
| tree | d82ee7e2aafdbb8e017dad62c85029236db4c9b7 /sql/ha_ndbcluster.cc | |
| parent | 844936abdc46fe46875c4d729dcfe91754180ff1 (diff) | |
| parent | 4619caa5d50a7eb6669bb7e1c0a8c647137c6916 (diff) | |
| download | mariadb-git-9532e822f109476d9a674bde50972bee743ade8d.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index c6f043498b8..fea50aeecdb 100644 --- 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; |