mirror of
https://github.com/MariaDB/server.git
synced 2025-10-30 04:26:45 +03:00
08dd5dcf16
Now we don't take any mutexes when creating or dropping internal HEAP tables during SELECT. Change buffer sizes to size_t to make keycache 64 bit safe on platforms where sizeof(ulong) != sizeof(size_t) BitKeeper/etc/ignore: added support-files/mysqld_multi.server include/heap.h: Added 'internal_table' to HP_CREATE_INFO include/keycache.h: Change buffer sizes to size_t to make keycache 64 bit safe include/my_base.h: Added HA_OPEN_INTERNAL_TABLE to mark temporary tables that should be deleted on close mysys/mf_keycache.c: Change buffer sizes to size_t to make keycache 64 bit safe sql/sql_select.cc: Added HA_OPEN_INTERNAL_TABLE to mark temporary tables that should be deleted on close Removed not anymore needed call to delete_table() storage/heap/ha_heap.cc: Added support for internal temporary tables that should be deleted on close. Internal tables now use dedicated open and close calls to avoid taking mutexes. If heap_open() failes, now delete the newly created table. (This fixes a possible memory leak) Remove never executed info() in create() storage/heap/ha_heap.h: Added slots needed to handle internal temporary tables storage/heap/heapdef.h: Protect against C++ inclusion storage/heap/hp_close.c: Don't call list_delete() for internal temporary tables (They are not in the list) storage/heap/hp_create.c: Added HP_SHARE ** element to heap_create() to store the SHARE of the newly created table. For internal temporary tables: Don't take any mutex and don't put them into the open table list. storage/heap/hp_open.c: Split heap_open() into sub functions to be able to create internal temporary tables without putting them in the heap_share_list. Add faster open() functions for when we already know the 'share'. storage/heap/hp_test1.c: Update call to heap_create() Initialize all keyinfo members. storage/heap/hp_test2.c: Update call to heap_create()
52 lines
1.5 KiB
C
52 lines
1.5 KiB
C
/* Copyright (C) 2000-2002 MySQL AB
|
|
|
|
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* close a heap-database */
|
|
|
|
#include "heapdef.h"
|
|
|
|
/* Close a database open by hp_open() */
|
|
/* Data is normally not deallocated */
|
|
|
|
int heap_close(HP_INFO *info)
|
|
{
|
|
int tmp;
|
|
DBUG_ENTER("heap_close");
|
|
pthread_mutex_lock(&THR_LOCK_heap);
|
|
tmp= hp_close(info);
|
|
pthread_mutex_unlock(&THR_LOCK_heap);
|
|
DBUG_RETURN(tmp);
|
|
}
|
|
|
|
|
|
int hp_close(register HP_INFO *info)
|
|
{
|
|
int error=0;
|
|
DBUG_ENTER("hp_close");
|
|
#ifndef DBUG_OFF
|
|
if (info->s->changed && heap_check_heap(info,0))
|
|
{
|
|
error=my_errno=HA_ERR_CRASHED;
|
|
}
|
|
#endif
|
|
info->s->changed=0;
|
|
if (info->open_list.data)
|
|
heap_open_list=list_delete(heap_open_list,&info->open_list);
|
|
if (!--info->s->open_count && info->s->delete_on_close)
|
|
hp_free(info->s); /* Table was deleted */
|
|
my_free((uchar*) info,MYF(0));
|
|
DBUG_RETURN(error);
|
|
}
|