summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.cc
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-11-11 16:36:26 -0800
committerunknown <jimw@mysql.com>2005-11-11 16:36:26 -0800
commit3e57afe698b056938839c97a5bd3c17283c7d5f3 (patch)
tree58c762a25f68322925e7e4f3d770ecd7b0bd5342 /sql/ha_berkeley.cc
parent2e3dfebb92c7161c233676ef4ef6762d1dbbc4ef (diff)
downloadmariadb-git-3e57afe698b056938839c97a5bd3c17283c7d5f3.tar.gz
Support full list of BDB deadlock detection methods. (Bug #14876)
sql/ha_berkeley.cc: Add full list of BDB lock detection types.
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r--sql/ha_berkeley.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index eeca6cb1657..ca5b060763d 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -89,9 +89,12 @@ static DB_ENV *db_env;
static HASH bdb_open_tables;
const char *berkeley_lock_names[] =
-{ "DEFAULT", "OLDEST","RANDOM","YOUNGEST",0 };
+{ "DEFAULT", "OLDEST", "RANDOM", "YOUNGEST", "EXPIRE", "MAXLOCKS",
+ "MAXWRITE", "MINLOCKS", "MINWRITE", 0 };
u_int32_t berkeley_lock_types[]=
-{ DB_LOCK_DEFAULT, DB_LOCK_OLDEST, DB_LOCK_RANDOM };
+{ DB_LOCK_DEFAULT, DB_LOCK_OLDEST, DB_LOCK_RANDOM, DB_LOCK_YOUNGEST,
+ DB_LOCK_EXPIRE, DB_LOCK_MAXLOCKS, DB_LOCK_MAXWRITE, DB_LOCK_MINLOCKS,
+ DB_LOCK_MINWRITE };
TYPELIB berkeley_lock_typelib= {array_elements(berkeley_lock_names)-1,"",
berkeley_lock_names, NULL};