diff options
| author | unknown <mskold/marty@quadfish.(none)> | 2007-12-07 14:04:58 +0100 |
|---|---|---|
| committer | unknown <mskold/marty@quadfish.(none)> | 2007-12-07 14:04:58 +0100 |
| commit | 122b464070998fdd88e0ac97e2d5b6f6dfec865f (patch) | |
| tree | d82ee7e2aafdbb8e017dad62c85029236db4c9b7 /sql/ha_ndbcluster.cc | |
| parent | e7af30694a4c173d8f70bd612fa0355b99a21317 (diff) | |
| parent | 4931d5cae544bcc026e7f85ebfc6fa935d7074d7 (diff) | |
| download | mariadb-git-122b464070998fdd88e0ac97e2d5b6f6dfec865f.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 | 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; |