summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.h
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-12-24 15:19:00 +0200
committermonty@donna.mysql.com <>2000-12-24 15:19:00 +0200
commitb590fa2567f3a4c1f0055618fb4d06e1af7ae85b (patch)
tree899e99579647137316d4fbc999750fb989b1cf2e /sql/ha_berkeley.h
parent11f7fd10f080461e34114869daf853ba714ff03c (diff)
downloadmariadb-git-b590fa2567f3a4c1f0055618fb4d06e1af7ae85b.tar.gz
New benchmark test
Fixed bug in REPLACE with BDB tables Prepare for write lock on read for BDB Inform the handler when we want to use IGNORE / REPLACE New manual pages
Diffstat (limited to 'sql/ha_berkeley.h')
-rw-r--r--sql/ha_berkeley.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/ha_berkeley.h b/sql/ha_berkeley.h
index b84a195e81c..1e32fdb8a7c 100644
--- a/sql/ha_berkeley.h
+++ b/sql/ha_berkeley.h
@@ -53,7 +53,8 @@ class ha_berkeley: public handler
ulong alloced_rec_buff_length;
ulong changed_rows;
uint primary_key,last_dup_key, hidden_primary_key, version;
- bool fixed_length_row, fixed_length_primary_key, key_read;
+ u_int32_t lock_on_read;
+ bool fixed_length_row, fixed_length_primary_key, key_read, using_ignore;
bool fix_rec_buff_for_blob(ulong length);
byte current_ident[BDB_HIDDEN_PRIMARY_KEY_LENGTH];
@@ -157,7 +158,8 @@ class ha_berkeley: public handler
};
extern bool berkeley_skip, berkeley_shared_data;
-extern u_int32_t berkeley_init_flags,berkeley_lock_type,berkeley_lock_types[];
+extern u_int32_t berkeley_init_flags,berkeley_env_flags, berkeley_lock_type,
+ berkeley_lock_types[];
extern ulong berkeley_cache_size, berkeley_max_lock;
extern char *berkeley_home, *berkeley_tmpdir, *berkeley_logdir;
extern long berkeley_lock_scan_time;