diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-03-14 12:25:26 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-03-14 12:25:26 +0100 |
| commit | e58dfda4128501ec46e3d2f3ead7e43dd9c0bdd5 (patch) | |
| tree | 7766ccb0fb6333bf2406005ca9c15f9a6069c229 /sql/ha_berkeley.cc | |
| parent | 096a7d63583791ab4515c3832647664c1aad086f (diff) | |
| parent | 90697f2467fda156d9a939738e443200a090884f (diff) | |
| download | mariadb-git-e58dfda4128501ec46e3d2f3ead7e43dd9c0bdd5.tar.gz | |
Manual merge
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/join_outer.result:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/ha_ndbcluster.cc:
Merged conflicts
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 f8e14844875..d57c51d24b1 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -371,8 +371,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 |