diff options
| author | unknown <mskold@mysql.com> | 2005-07-05 12:24:03 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-07-05 12:24:03 +0200 |
| commit | cd42770548db9a4dea7f607f113be8ecaae19cc8 (patch) | |
| tree | d7e97b69ea0b239adf5e10b6b1d3823e652de797 /sql/ha_ndbcluster.h | |
| parent | 0362dcf54348bb04ff1e898714ffde28538643fe (diff) | |
| parent | e9ac18c204c0600e651986ad90dd1fffe915d879 (diff) | |
| download | mariadb-git-cd42770548db9a4dea7f607f113be8ecaae19cc8.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
Diffstat (limited to 'sql/ha_ndbcluster.h')
| -rw-r--r-- | sql/ha_ndbcluster.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 5c1d121a157..8e44733f905 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -168,7 +168,7 @@ class ha_ndbcluster: public handler int pk_read(const byte *key, uint key_len, byte *buf); int complemented_pk_read(const byte *old_data, byte *new_data); - int peek_row(); + int peek_row(const byte *record); int unique_index_read(const byte *key, uint key_len, byte *buf); int ordered_index_scan(const key_range *start_key, @@ -196,8 +196,7 @@ class ha_ndbcluster: public handler 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(NdbOperation *op); - int set_primary_key_from_old_data(NdbOperation *op, const byte *old_data); + int set_primary_key_from_record(NdbOperation *op, const byte *old_data); int set_bounds(NdbIndexScanOperation *ndb_op, const key_range *keys[2]); int key_cmp(uint keynr, const byte * old_row, const byte * new_row); void print_results(); |