mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
d5e15424d8
The MDEV-29693 conflict resolution is from Monty, as well as is
a bug fix where ANALYZE TABLE wrongly built histograms for
single-column PRIMARY KEY.
Also includes a fix for safe_malloc error reporting.
Other things:
- Copied main.log_slow from 10.4 to avoid mtr issue
Disabled test:
- spider/bugfix.mdev_27239 because we started to get
+Error 1429 Unable to connect to foreign data source: localhost
-Error 1158 Got an error reading communication packets
- main.delayed
- Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED
This part is disabled for now as it fails randomly with different
warnings/errors (no corruption).
101 lines
2.7 KiB
C
101 lines
2.7 KiB
C
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
|
|
Copyright (c) 2022, MariaDB Corporation.
|
|
|
|
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-1335 USA */
|
|
|
|
/* Alloc a block of locked memory (memory protected against swap) */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include "aligned.h"
|
|
#include <my_list.h>
|
|
|
|
#ifdef HAVE_MLOCK
|
|
|
|
struct st_mem_list
|
|
{
|
|
LIST list;
|
|
uchar *page;
|
|
uint size;
|
|
};
|
|
|
|
LIST *mem_list;
|
|
|
|
uchar *my_malloc_lock(size_t size, myf MyFlags)
|
|
{
|
|
int success;
|
|
uint pagesize= my_system_page_size;
|
|
uchar *ptr;
|
|
struct st_mem_list *element;
|
|
DBUG_ENTER("my_malloc_lock");
|
|
|
|
size=((size-1) & ~(pagesize-1))+pagesize;
|
|
if (!(ptr=aligned_malloc(size,pagesize)))
|
|
{
|
|
if (MyFlags & (MY_FAE+MY_WME))
|
|
my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_FATAL), size);
|
|
DBUG_RETURN(0);
|
|
}
|
|
success = mlock((uchar*) ptr,size);
|
|
if (success != 0 && geteuid() == 0)
|
|
{
|
|
DBUG_PRINT("warning",("Failed to lock memory. errno %d\n",
|
|
errno));
|
|
fprintf(stderr, "Warning: Failed to lock memory. errno %d\n",
|
|
errno);
|
|
}
|
|
else
|
|
{
|
|
/* Add block in a list for munlock */
|
|
if (!(element=(struct st_mem_list*) my_malloc(sizeof(*element),MyFlags)))
|
|
{
|
|
(void) munlock((uchar*) ptr,size);
|
|
free(ptr);
|
|
DBUG_RETURN(0);
|
|
}
|
|
element->list.data=(uchar*) element;
|
|
element->page=ptr;
|
|
element->size=size;
|
|
mysql_mutex_lock(&THR_LOCK_malloc);
|
|
mem_list=list_add(mem_list,&element->list);
|
|
mysql_mutex_unlock(&THR_LOCK_malloc);
|
|
update_malloc_size((longlong) size, 0);
|
|
}
|
|
DBUG_RETURN(ptr);
|
|
}
|
|
|
|
|
|
void my_free_lock(uchar *ptr)
|
|
{
|
|
LIST *list;
|
|
struct st_mem_list *element=0;
|
|
|
|
mysql_mutex_lock(&THR_LOCK_malloc);
|
|
for (list=mem_list ; list ; list=list->next)
|
|
{
|
|
element=(struct st_mem_list*) list->data;
|
|
if (ptr == element->page)
|
|
{ /* Found locked mem */
|
|
(void) munlock((uchar*) ptr,element->size);
|
|
mem_list=list_delete(mem_list,list);
|
|
update_malloc_size(- (longlong) element->size, 0);
|
|
break;
|
|
}
|
|
}
|
|
mysql_mutex_unlock(&THR_LOCK_malloc);
|
|
my_free(element);
|
|
aligned_free(ptr); /* Free even if not locked */
|
|
}
|
|
|
|
#endif /* HAVE_MLOCK */
|