diff options
| author | unknown <jimw@mysql.com> | 2005-12-05 18:09:42 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-12-05 18:09:42 -0800 |
| commit | 002101a4c9d06d598d62d4204e9dd4cabc8621c8 (patch) | |
| tree | 2874048b71bcf8ba7a1999a826dd93ffe980ab01 /sql/ha_berkeley.cc | |
| parent | da8150d50803956b88ee766890de8e51b68d0f87 (diff) | |
| parent | ac5164b8f15f49f43291be7879fd1509e9862aaf (diff) | |
| download | mariadb-git-002101a4c9d06d598d62d4204e9dd4cabc8621c8.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.1-14880
into mysql.com:/home/jimw/my/mysql-5.1-clean
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/mysqld.cc:
SCCS merged
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index 196665293f4..188ed7fbaa6 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -74,6 +74,8 @@ const u_int32_t bdb_DB_TXN_NOSYNC= DB_TXN_NOSYNC; const u_int32_t bdb_DB_RECOVER= DB_RECOVER; const u_int32_t bdb_DB_PRIVATE= DB_PRIVATE; +const u_int32_t bdb_DB_DIRECT_DB= DB_DIRECT_DB; +const u_int32_t bdb_DB_DIRECT_LOG= DB_DIRECT_LOG; const char *ha_berkeley_ext=".db"; bool berkeley_shared_data=0; u_int32_t berkeley_init_flags= DB_PRIVATE | DB_RECOVER, |