mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 08:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

my_pagepages: perror -> my_error

Browse source
This commit is contained in:
Daniel Black 2020-04-07 10:00:10 +10:00 • committed by Sergey Vojtovich
commit a0d5894015
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/mysys_err.h
View file

@ -71,7 +71,8 @@ extern const char *globerrs[]; /* my_error_messages is here */
#define EE_CANT_COPY_OWNERSHIP 35
#define EE_BADMEMORYRELEASE 36
#define EE_PERM_LOCK_MEMORY 37
#define EE_ERROR_LAST 37 /* Copy last error nr */
#define EE_MEMCNTL 38
#define EE_ERROR_LAST 38 /* Copy last error nr */
/* Add error numbers before EE_ERROR_LAST and change it accordingly. */

4
mysys/errors.c
View file

@ -57,7 +57,8 @@ const char *globerrs[GLOBERRS]=
"Can't change mode for file '%s' to 0x%lx (Errcode: %M)",
"Warning: Can't copy ownership for file '%s' (Errcode: %M)",
"Failed to release memory pointer %p, %zu bytes (Errcode: %M)",
"Lock Pages in memory access rights required"
"Lock Pages in memory access rights required",
"Memcntl %s cmd %s error"
};
void init_glob_errs(void)
@ -105,6 +106,7 @@ void init_glob_errs()
EE(EE_CANT_COPY_OWNERSHIP)= "Warning: Can't copy ownership for file '%s' (Errcode: %M)";
EE(EE_BADMEMORYRELEASE)= "Failed to release memory pointer %p, %zu bytes (Errcode: %M)";
EE(EE_PERM_LOCK_MEMORY)= "Lock Pages in memory access rights required";
EE(EE_MEMCNTL) = "Memcntl %s cmd %s error";
}
#endif

6
mysys/my_largepage.c
View file

@ -234,12 +234,14 @@ int my_init_large_pages(my_bool super_large_pages)
mpss.mha_flags= 0;
if (memcntl(NULL, 0, MC_HAT_ADVISE, (caddr_t) &mpss, 0, 0))
{
perror("memcntl MC_HAT_ADVISE cmd MHA_MAPSIZE_BSSBRK error (continuing)");
my_error(EE_MEMCNTL, MYF(ME_WARNING | ME_ERROR_LOG_ONLY), "MC_HAT_ADVISE",
"MHA_MAPSIZE_BSSBRK");
}
mpss.mha_cmd= MHA_MAPSIZE_STACK;
if (memcntl(NULL, 0, MC_HAT_ADVISE, (caddr_t) &mpss, 0, 0))
{
perror("memcntl MC_HAT_ADVISE cmd MHA_MAPSIZE_STACK error (continuing)");
my_error(EE_MEMCNTL, MYF(ME_WARNING | ME_ERROR_LOG_ONLY), "MC_HAT_ADVISE",
"MHA_MAPSIZE_STACK");
}
}
#endif /* HAVE_SOLARIS_LARGE_PAGES */