diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-03-15 01:14:59 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-03-15 01:14:59 +0200 |
| commit | ce4f43cb860e71a3d5e48773e305ff8e5e130872 (patch) | |
| tree | 38b35a692e04a05e5ce7bb2ea7db137736a61695 /sql/ha_berkeley.cc | |
| parent | 6950d57ffd8caeffd86933b7088c2aa77cec7da6 (diff) | |
| parent | 8ee298cc7502f2537d9899093b786a0955ba20f9 (diff) | |
| download | mariadb-git-ce4f43cb860e71a3d5e48773e305ff8e5e130872.tar.gz | |
Merge 4.1 - 5.0
BitKeeper/etc/logging_ok:
auto-union
sql/ha_berkeley.cc:
Auto merged
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index b91a0624335..a6cc05e1fdb 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -372,8 +372,9 @@ void berkeley_cleanup_log_files(void) ** Berkeley DB tables *****************************************************************************/ +static const char *ha_bdb_bas_exts[]= { ha_berkeley_ext, NullS }; const char **ha_berkeley::bas_ext() const -{ static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; } +{ return ha_bdb_bas_exts; } ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const |