diff options
| author | unknown <mskold@mysql.com> | 2005-07-06 11:39:48 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-07-06 11:39:48 +0200 |
| commit | 4a829a99c8743438a1c61de8145a2b66db13188d (patch) | |
| tree | 6d112c6b461fa038ada62b0a65647444ca064e4b /sql/ha_ndbcluster.h | |
| parent | de7826461dd2d35f46f1e1898a583b976f9e8f5d (diff) | |
| parent | 72e3ff3065300425d3e18bd53de8b746154a46aa (diff) | |
| download | mariadb-git-4a829a99c8743438a1c61de8145a2b66db13188d.tar.gz | |
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
client/mysqldump.c:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster.cc:
Merge
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index b75853dd5d0..b34f8dd063c 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -580,7 +580,7 @@ private: friend int g_get_ndb_blobs_value(NdbBlob *ndb_blob, void *arg); int get_ndb_blobs_value(NdbBlob *last_ndb_blob); int set_primary_key(NdbOperation *op, const byte *key); - int set_primary_key_from_record(NdbOperation *op, const byte *old_data); + int set_primary_key_from_record(NdbOperation *op, const byte *record); int set_bounds(NdbIndexScanOperation*, const key_range *keys[2], uint= 0); int key_cmp(uint keynr, const byte * old_row, const byte * new_row); int set_index_key(NdbOperation *, const KEY *key_info, const byte *key_ptr); |