diff options
| author | pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2005-08-25 13:11:38 -0400 |
|---|---|---|
| committer | pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se <> | 2005-08-25 13:11:38 -0400 |
| commit | 02056f8e3ae729c06875ab63eef8680574b3d91e (patch) | |
| tree | 86faf87634c19937967b360a0dd1413fc9eb2879 /sql/ha_berkeley.h | |
| parent | 1c9a78438e789a70c6ee3f227c164739c4bd25e2 (diff) | |
| parent | 0c859d6651277c2ee3664cb14bb34a23d048731f (diff) | |
| download | mariadb-git-02056f8e3ae729c06875ab63eef8680574b3d91e.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
Diffstat (limited to 'sql/ha_berkeley.h')
| -rw-r--r-- | sql/ha_berkeley.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h index ee8f4b80049..aab76accefa 100644 --- a/sql/ha_berkeley.h +++ b/sql/ha_berkeley.h @@ -74,13 +74,12 @@ class ha_berkeley: public handler DBT *prim_key, key_map *keys); int restore_keys(DB_TXN *trans, key_map *changed_keys, uint primary_key, const byte *old_row, DBT *old_key, - const byte *new_row, DBT *new_key, - ulong thd_options); + const byte *new_row, DBT *new_key); int key_cmp(uint keynr, const byte * old_row, const byte * new_row); int update_primary_key(DB_TXN *trans, bool primary_key_changed, const byte * old_row, DBT *old_key, const byte * new_row, DBT *prim_key, - ulong thd_options, bool local_using_ignore); + bool local_using_ignore); int read_row(int error, char *buf, uint keynr, DBT *row, DBT *key, bool); DBT *get_pos(DBT *to, byte *pos); |