Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a0d58940
Commit
a0d58940
authored
Apr 07, 2020
by
Daniel Black
Committed by
Sergey Vojtovich
Apr 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
my_pagepages: perror -> my_error
parent
a535d4d1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
include/mysys_err.h
include/mysys_err.h
+2
-1
mysys/errors.c
mysys/errors.c
+3
-1
mysys/my_largepage.c
mysys/my_largepage.c
+4
-2
No files found.
include/mysys_err.h
View file @
a0d58940
...
...
@@ -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. */
...
...
mysys/errors.c
View file @
a0d58940
...
...
@@ -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
...
...
mysys/my_largepage.c
View file @
a0d58940
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment