summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2005-08-12 13:54:42 +0300
committermonty@mysql.com <>2005-08-12 13:54:42 +0300
commit4c0d23e156d1148243ae8439c1115280e78ad04c (patch)
tree70e0735a5a37bab3dae8e75c038e4c86703fc643 /sql/ha_berkeley.h
parente80252e53cfd040dc09e6160d4c2d8ed9c1bbe54 (diff)
downloadmariadb-git-4c0d23e156d1148243ae8439c1115280e78ad04c.tar.gz
Fixes during review of new pushed code
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
Diffstat (limited to 'sql/ha_berkeley.h')
-rw-r--r--sql/ha_berkeley.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h
index aa92908ecde..282641e3f25 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);