mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
7887babe69
- Reserver namespace and place in frm for TABLE_CHECKSUM and PAGE_CHECKSUM create options - Added syncing of directory when creating .frm files - Portability fixes - Added missing cast that could cause bugs - Code cleanups - Made some bit functions inline - Moved things out of myisam.h to my_handler.h to make them more accessable - Renamed some myisam variables and defines to make them more globaly usable (as they are used outside of MyISAM) - Fixed bugs in error conditions - Use compiler time asserts instead of run time - Fixed indentation HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP as the old name was wrong (Added a define for old value to ensure we don't break any old code) Added HA_EXTRA_PREPARE_FOR_RENAME as a signal for rename (before we used a DROP signal which is wrong) - Initialize error messages early to get better errors when mysqld or an engine fails to start - Fix windows bug that query_performance_frequency was not initialized if registry code failed - thread_stack -> my_thread_stack_size
75 lines
2.3 KiB
C
75 lines
2.3 KiB
C
/* Copyright (C) 2000 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 */
|
|
|
|
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
|
|
#undef SAFEMALLOC
|
|
#endif
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
|
|
/* My memory re allocator */
|
|
|
|
/**
|
|
@brief wrapper around realloc()
|
|
|
|
@param oldpoint pointer to currently allocated area
|
|
@param size new size requested, must be >0
|
|
@param my_flags flags
|
|
|
|
@note if size==0 realloc() may return NULL; my_realloc() treats this as an
|
|
error which is not the intention of realloc()
|
|
*/
|
|
void* my_realloc(void* oldpoint, size_t size, myf my_flags)
|
|
{
|
|
void *point;
|
|
DBUG_ENTER("my_realloc");
|
|
DBUG_PRINT("my",("ptr: 0x%lx size: %lu my_flags: %d", (long) oldpoint,
|
|
(ulong) size, my_flags));
|
|
|
|
DBUG_ASSERT(size > 0);
|
|
if (!oldpoint && (my_flags & MY_ALLOW_ZERO_PTR))
|
|
DBUG_RETURN(my_malloc(size,my_flags));
|
|
#ifdef USE_HALLOC
|
|
if (!(point = malloc(size)))
|
|
{
|
|
if (my_flags & MY_FREE_ON_ERROR)
|
|
my_free(oldpoint,my_flags);
|
|
if (my_flags & MY_HOLD_ON_ERROR)
|
|
DBUG_RETURN(oldpoint);
|
|
my_errno=errno;
|
|
if (my_flags & MY_FAE+MY_WME)
|
|
my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),size);
|
|
}
|
|
else
|
|
{
|
|
memcpy(point,oldpoint,size);
|
|
free(oldpoint);
|
|
}
|
|
#else
|
|
if ((point= (uchar*) realloc(oldpoint,size)) == NULL)
|
|
{
|
|
if (my_flags & MY_FREE_ON_ERROR)
|
|
my_free(oldpoint, my_flags);
|
|
if (my_flags & MY_HOLD_ON_ERROR)
|
|
DBUG_RETURN(oldpoint);
|
|
my_errno=errno;
|
|
if (my_flags & (MY_FAE+MY_WME))
|
|
my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG), size);
|
|
}
|
|
#endif
|
|
DBUG_PRINT("exit",("ptr: 0x%lx", (long) point));
|
|
DBUG_RETURN(point);
|
|
} /* my_realloc */
|