1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Martin Hansson 2009-04-29 20:52:37 +02:00
commit 4ba05b50a2
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysys/mf_keycache.c
View File

@ -2044,13 +2044,15 @@ restart:
} }
else else
{ {
size_t block_mem_offset;
/* There are some never used blocks, take first of them */ /* There are some never used blocks, take first of them */
DBUG_ASSERT(keycache->blocks_used < DBUG_ASSERT(keycache->blocks_used <
(ulong) keycache->disk_blocks); (ulong) keycache->disk_blocks);
block= &keycache->block_root[keycache->blocks_used]; block= &keycache->block_root[keycache->blocks_used];
block_mem_offset=
((size_t) keycache->blocks_used) * keycache->key_cache_block_size;
block->buffer= ADD_TO_PTR(keycache->block_mem, block->buffer= ADD_TO_PTR(keycache->block_mem,
((ulong) keycache->blocks_used* block_mem_offset,
keycache->key_cache_block_size),
uchar*); uchar*);
keycache->blocks_used++; keycache->blocks_used++;
DBUG_ASSERT(!block->next_used); DBUG_ASSERT(!block->next_used);

2
mysys/safemalloc.c
View File

@ -174,7 +174,7 @@ void *_mymalloc(size_t size, const char *filename, uint lineno, myf MyFlags)
data[size + 3]= MAGICEND3; data[size + 3]= MAGICEND3;
irem->filename= (char *) filename; irem->filename= (char *) filename;
irem->linenum= lineno; irem->linenum= lineno;
irem->datasize= (uint32) size; irem->datasize= size;
irem->prev= NULL; irem->prev= NULL;
/* Add this remember structure to the linked list */ /* Add this remember structure to the linked list */

7
storage/ibmdb2i/ha_ibmdb2i.cc
View File

@ -898,6 +898,8 @@ int ha_ibmdb2i::index_init(uint idx, bool sorted)
releaseIndexFile(idx); releaseIndexFile(idx);
} }
rrnAssocHandle= 0;
DBUG_RETURN(rc); DBUG_RETURN(rc);
} }
@ -1154,6 +1156,8 @@ int ha_ibmdb2i::rnd_init(bool scan)
releaseDataFile(); releaseDataFile();
} }
rrnAssocHandle= 0;
DBUG_RETURN(0); // MySQL sometimes does not check the return code, causing DBUG_RETURN(0); // MySQL sometimes does not check the return code, causing
// an assert in ha_rnd_end later on if we return a non-zero // an assert in ha_rnd_end later on if we return a non-zero
// value here. // value here.
@ -1251,7 +1255,8 @@ int ha_ibmdb2i::rnd_pos(uchar * buf, uchar *pos)
int rc = 0; int rc = 0;
if (activeHandle != rrnAssocHandle) if (rrnAssocHandle &&
(activeHandle != rrnAssocHandle))
{ {
if (activeHandle) releaseActiveHandle(); if (activeHandle) releaseActiveHandle();
rc = useFileByHandle(QMY_UPDATABLE, rrnAssocHandle); rc = useFileByHandle(QMY_UPDATABLE, rrnAssocHandle);