diff options
Diffstat (limited to 'sql/ha_berkeley.cc')
| -rw-r--r-- | sql/ha_berkeley.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc index a6cc05e1fdb..54d9865ddd5 100644 --- a/sql/ha_berkeley.cc +++ b/sql/ha_berkeley.cc @@ -372,9 +372,8 @@ 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 -{ return ha_bdb_bas_exts; } +{ static const char *ext[]= { ha_berkeley_ext, NullS }; return ext; } ulong ha_berkeley::index_flags(uint idx, uint part, bool all_parts) const @@ -1548,7 +1547,7 @@ int ha_berkeley::index_read(byte * buf, const byte * key, do_prev= 1; } if (key_len == key_info->key_length && - !table->key_info[active_index].flags & HA_END_SPACE_KEY) + !(table->key_info[active_index].flags & HA_END_SPACE_KEY)) { if (find_flag == HA_READ_AFTER_KEY) key_info->handler.bdb_return_if_eq= 1; @@ -1646,7 +1645,7 @@ int ha_berkeley::index_next_same(byte * buf, const byte *key, uint keylen) &LOCK_status); bzero((char*) &row,sizeof(row)); if (keylen == table->key_info[active_index].key_length && - !table->key_info[active_index].flags & HA_END_SPACE_KEY) + !(table->key_info[active_index].flags & HA_END_SPACE_KEY)) error=read_row(cursor->c_get(cursor, &last_key, &row, DB_NEXT_DUP), (char*) buf, active_index, &row, &last_key, 1); else |