summaryrefslogtreecommitdiff
path: root/sql/ha_berkeley.cc
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-03-18 16:12:25 -0800
committerjimw@mysql.com <>2005-03-18 16:12:25 -0800
commitee2b4ec959b5813eb2105ea068ae3f725b106a3b (patch)
tree61d6303821b0ae97f521facf399af6c9ba99e342 /sql/ha_berkeley.cc
parent348c285d0f06b46809758f26ca92d6ee6155bac9 (diff)
downloadmariadb-git-ee2b4ec959b5813eb2105ea068ae3f725b106a3b.tar.gz
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
Windows to call CreateFileMapping() with correct arguments, and propogating the introduction of query_id_t to everywhere query ids are passed around. (Bug #8826)
Diffstat (limited to 'sql/ha_berkeley.cc')
-rw-r--r--sql/ha_berkeley.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_berkeley.cc b/sql/ha_berkeley.cc
index a6cc05e1fdb..da4d34e6060 100644
--- a/sql/ha_berkeley.cc
+++ b/sql/ha_berkeley.cc
@@ -1548,7 +1548,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 +1646,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