Commit ce4f43cb authored by unknown's avatar unknown
Browse files

Merge 4.1 - 5.0 


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Auto merged
parents 6950d57f 8ee298cc

sql/ha_berkeley.cc

+2 −1
Original line number Diff line number Diff line
@@ -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