mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 22:34:18 +01:00
ded448d1d0
The reason was that a couple of variables that hold number of rows that was used to calculate buffers was uint and caused an overflow. Fixed by changing variables that could hold number of rows from uint to ulong and also added a cast for this test. include/heap.h: Reorder to get better alignment. Changed variables that could hold number of rows from uint to ulong mysql-test/suite/heap/heap.result: Added test case mysql-test/suite/heap/heap.test: Added test case mysql-test/suite/plugins/t/server_audit.test: Added sleep as we want to have disconnect logged before we try a new connect storage/heap/ha_heap.cc: Changed variables that could hold number of rows from uint to ulong Limit number of rows to 4G (as most of the variables that holds rows are ulong anyway) reset records_changed when key_stat_version is changed to not cause increments for every row changed storage/heap/ha_heap.h: changed records_changed to ulong as this can get big storage/heap/hp_create.c: Changed variables that could hold number of rows from uint to ulong Added cast (fixed the original bug) storage/heap/hp_delete.c: Changed variables that could hold number of rows from uint to ulong storage/heap/hp_open.c: Removed not needed cast storage/heap/hp_write.c: Changed variables that could hold number of rows from uint to ulong support-files/compiler_warnings.supp: Removed extra : from supression
150 lines
3.9 KiB
C
150 lines
3.9 KiB
C
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
/* open a heap-database */
|
|
|
|
#include "heapdef.h"
|
|
#include "my_sys.h"
|
|
|
|
/*
|
|
Open heap table based on HP_SHARE structure
|
|
|
|
NOTE
|
|
This doesn't register the table in the open table list.
|
|
*/
|
|
|
|
HP_INFO *heap_open_from_share(HP_SHARE *share, int mode)
|
|
{
|
|
HP_INFO *info;
|
|
DBUG_ENTER("heap_open_from_share");
|
|
|
|
if (!(info= (HP_INFO*) my_malloc(sizeof(HP_INFO) +
|
|
2 * share->max_key_length,
|
|
MYF(MY_ZEROFILL))))
|
|
{
|
|
DBUG_RETURN(0);
|
|
}
|
|
share->open_count++;
|
|
thr_lock_data_init(&share->lock,&info->lock,NULL);
|
|
info->s= share;
|
|
info->lastkey= (uchar*) (info + 1);
|
|
info->recbuf= (uchar*) (info->lastkey + share->max_key_length);
|
|
info->mode= mode;
|
|
info->current_record= (ulong) ~0L; /* No current record */
|
|
info->lastinx= info->errkey= -1;
|
|
#ifndef DBUG_OFF
|
|
info->opt_flag= READ_CHECK_USED; /* Check when changing */
|
|
#endif
|
|
DBUG_PRINT("exit",("heap: 0x%lx reclength: %d records_in_block: %lu",
|
|
(long) info, share->reclength,
|
|
share->block.records_in_block));
|
|
DBUG_RETURN(info);
|
|
}
|
|
|
|
|
|
/*
|
|
Open heap table based on HP_SHARE structure and register it
|
|
*/
|
|
|
|
HP_INFO *heap_open_from_share_and_register(HP_SHARE *share, int mode)
|
|
{
|
|
HP_INFO *info;
|
|
DBUG_ENTER("heap_open_from_share_and_register");
|
|
|
|
mysql_mutex_lock(&THR_LOCK_heap);
|
|
if ((info= heap_open_from_share(share, mode)))
|
|
{
|
|
info->open_list.data= (void*) info;
|
|
heap_open_list= list_add(heap_open_list,&info->open_list);
|
|
/* Unpin the share, it is now pinned by the file. */
|
|
share->open_count--;
|
|
}
|
|
mysql_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(info);
|
|
}
|
|
|
|
|
|
/**
|
|
Dereference a HEAP share and free it if it's not referenced.
|
|
We don't check open_count for internal tables since they
|
|
are always thread-local, i.e. referenced by a single thread.
|
|
*/
|
|
void heap_release_share(HP_SHARE *share, my_bool internal_table)
|
|
{
|
|
/* Couldn't open table; Remove the newly created table */
|
|
if (internal_table)
|
|
hp_free(share);
|
|
else
|
|
{
|
|
mysql_mutex_lock(&THR_LOCK_heap);
|
|
if (--share->open_count == 0)
|
|
hp_free(share);
|
|
mysql_mutex_unlock(&THR_LOCK_heap);
|
|
}
|
|
}
|
|
|
|
/*
|
|
Open heap table based on name
|
|
|
|
NOTE
|
|
This register the table in the open table list. so that it can be
|
|
found by future heap_open() calls.
|
|
*/
|
|
|
|
HP_INFO *heap_open(const char *name, int mode)
|
|
{
|
|
HP_INFO *info;
|
|
HP_SHARE *share;
|
|
DBUG_ENTER("heap_open");
|
|
|
|
mysql_mutex_lock(&THR_LOCK_heap);
|
|
if (!(share= hp_find_named_heap(name)))
|
|
{
|
|
my_errno= ENOENT;
|
|
mysql_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(0);
|
|
}
|
|
if ((info= heap_open_from_share(share, mode)))
|
|
{
|
|
info->open_list.data= (void*) info;
|
|
heap_open_list= list_add(heap_open_list,&info->open_list);
|
|
}
|
|
mysql_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(info);
|
|
}
|
|
|
|
|
|
/* map name to a heap-nr. If name isn't found return 0 */
|
|
|
|
HP_SHARE *hp_find_named_heap(const char *name)
|
|
{
|
|
LIST *pos;
|
|
HP_SHARE *info;
|
|
DBUG_ENTER("heap_find");
|
|
DBUG_PRINT("enter",("name: %s",name));
|
|
|
|
for (pos= heap_share_list; pos; pos= pos->next)
|
|
{
|
|
info= (HP_SHARE*) pos->data;
|
|
if (!strcmp(name, info->name))
|
|
{
|
|
DBUG_PRINT("exit", ("Old heap_database: 0x%lx", (long) info));
|
|
DBUG_RETURN(info);
|
|
}
|
|
}
|
|
DBUG_RETURN((HP_SHARE *) 0);
|
|
}
|
|
|
|
|