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
e895041b
Commit
e895041b
authored
Mar 30, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.2 into 10.3
parents
d2660362
55f4e480
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
11 deletions
+13
-11
cmake/os/Linux.cmake
cmake/os/Linux.cmake
+1
-1
config.h.cmake
config.h.cmake
+1
-1
include/my_sys.h
include/my_sys.h
+3
-3
mysql-test/suite/innodb/t/innodb-index.test
mysql-test/suite/innodb/t/innodb-index.test
+2
-0
mysys/CMakeLists.txt
mysys/CMakeLists.txt
+1
-1
mysys/my_largepage.c
mysys/my_largepage.c
+2
-2
mysys/my_static.c
mysys/my_static.c
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+2
-2
No files found.
cmake/os/Linux.cmake
View file @
e895041b
...
@@ -45,7 +45,7 @@ SET(_FILE_OFFSET_BITS 64)
...
@@ -45,7 +45,7 @@ SET(_FILE_OFFSET_BITS 64)
# Linux specific HUGETLB /large page support
# Linux specific HUGETLB /large page support
CHECK_SYMBOL_EXISTS
(
SHM_HUGETLB sys/shm.h HAVE_DECL_SHM_HUGETLB
)
CHECK_SYMBOL_EXISTS
(
SHM_HUGETLB sys/shm.h HAVE_DECL_SHM_HUGETLB
)
IF
(
HAVE_DECL_SHM_HUGETLB
)
IF
(
HAVE_DECL_SHM_HUGETLB
)
SET
(
HAVE_LARGE_PAGES 1
)
SET
(
HAVE_L
INUX_L
ARGE_PAGES 1
)
SET
(
HUGETLB_USE_PROC_MEMINFO 1
)
SET
(
HUGETLB_USE_PROC_MEMINFO 1
)
SET
(
HAVE_LARGE_PAGE_OPTION 1
)
SET
(
HAVE_LARGE_PAGE_OPTION 1
)
ENDIF
()
ENDIF
()
...
...
config.h.cmake
View file @
e895041b
...
@@ -392,7 +392,7 @@
...
@@ -392,7 +392,7 @@
#cmakedefine HAVE_GCC_C11_ATOMICS 1
#cmakedefine HAVE_GCC_C11_ATOMICS 1
#cmakedefine HAVE_SOLARIS_ATOMIC 1
#cmakedefine HAVE_SOLARIS_ATOMIC 1
#cmakedefine HAVE_DECL_SHM_HUGETLB 1
#cmakedefine HAVE_DECL_SHM_HUGETLB 1
#cmakedefine HAVE_LARGE_PAGES 1
#cmakedefine HAVE_L
INUX_L
ARGE_PAGES 1
#cmakedefine HUGETLB_USE_PROC_MEMINFO 1
#cmakedefine HUGETLB_USE_PROC_MEMINFO 1
#cmakedefine NO_FCNTL_NONBLOCK 1
#cmakedefine NO_FCNTL_NONBLOCK 1
#cmakedefine NO_ALARM 1
#cmakedefine NO_ALARM 1
...
...
include/my_sys.h
View file @
e895041b
...
@@ -177,7 +177,7 @@ extern void *my_memdup(const void *from,size_t length,myf MyFlags);
...
@@ -177,7 +177,7 @@ extern void *my_memdup(const void *from,size_t length,myf MyFlags);
extern
char
*
my_strdup
(
const
char
*
from
,
myf
MyFlags
);
extern
char
*
my_strdup
(
const
char
*
from
,
myf
MyFlags
);
extern
char
*
my_strndup
(
const
char
*
from
,
size_t
length
,
myf
MyFlags
);
extern
char
*
my_strndup
(
const
char
*
from
,
size_t
length
,
myf
MyFlags
);
#ifdef HAVE_LARGE_PAGES
#ifdef HAVE_L
INUX_L
ARGE_PAGES
extern
uint
my_get_large_page_size
(
void
);
extern
uint
my_get_large_page_size
(
void
);
extern
uchar
*
my_large_malloc
(
size_t
size
,
myf
my_flags
);
extern
uchar
*
my_large_malloc
(
size_t
size
,
myf
my_flags
);
extern
void
my_large_free
(
uchar
*
ptr
);
extern
void
my_large_free
(
uchar
*
ptr
);
...
@@ -185,7 +185,7 @@ extern void my_large_free(uchar *ptr);
...
@@ -185,7 +185,7 @@ extern void my_large_free(uchar *ptr);
#define my_get_large_page_size() (0)
#define my_get_large_page_size() (0)
#define my_large_malloc(A,B) my_malloc_lock((A),(B))
#define my_large_malloc(A,B) my_malloc_lock((A),(B))
#define my_large_free(A) my_free_lock((A))
#define my_large_free(A) my_free_lock((A))
#endif
/* HAVE_LARGE_PAGES */
#endif
/* HAVE_L
INUX_L
ARGE_PAGES */
void
my_init_atomic_write
(
void
);
void
my_init_atomic_write
(
void
);
#ifdef __linux__
#ifdef __linux__
...
@@ -243,7 +243,7 @@ extern int sf_leaking_memory; /* set to 1 to disable memleak detection */
...
@@ -243,7 +243,7 @@ extern int sf_leaking_memory; /* set to 1 to disable memleak detection */
extern
void
(
*
proc_info_hook
)(
void
*
,
const
PSI_stage_info
*
,
PSI_stage_info
*
,
extern
void
(
*
proc_info_hook
)(
void
*
,
const
PSI_stage_info
*
,
PSI_stage_info
*
,
const
char
*
,
const
char
*
,
const
unsigned
int
);
const
char
*
,
const
char
*
,
const
unsigned
int
);
#ifdef HAVE_LARGE_PAGES
#ifdef HAVE_L
INUX_L
ARGE_PAGES
extern
my_bool
my_use_large_pages
;
extern
my_bool
my_use_large_pages
;
extern
uint
my_large_page_size
;
extern
uint
my_large_page_size
;
#endif
#endif
...
...
mysql-test/suite/innodb/t/innodb-index.test
View file @
e895041b
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
# Embedded server tests do not support restarting.
--
source
include
/
not_embedded
.
inc
let
$MYSQLD_DATADIR
=
`select @@datadir`
;
let
$MYSQLD_DATADIR
=
`select @@datadir`
;
...
...
mysys/CMakeLists.txt
View file @
e895041b
...
@@ -64,7 +64,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
...
@@ -64,7 +64,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_C_COMPILER_ID MATCHES "SunPro")
PROPERTIES COMPILE_FLAGS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/my_timer_cycles.il"
)
PROPERTIES COMPILE_FLAGS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/my_timer_cycles.il"
)
ENDIF
()
ENDIF
()
IF
(
HAVE_LARGE_PAGES
)
IF
(
HAVE_L
INUX_L
ARGE_PAGES
)
SET
(
MYSYS_SOURCES
${
MYSYS_SOURCES
}
my_largepage.c
)
SET
(
MYSYS_SOURCES
${
MYSYS_SOURCES
}
my_largepage.c
)
ENDIF
()
ENDIF
()
...
...
mysys/my_largepage.c
View file @
e895041b
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
#include "mysys_priv.h"
#include "mysys_priv.h"
#ifdef HAVE_LARGE_PAGES
#ifdef HAVE_L
INUX_L
ARGE_PAGES
#ifdef HAVE_SYS_IPC_H
#ifdef HAVE_SYS_IPC_H
#include <sys/ipc.h>
#include <sys/ipc.h>
...
@@ -163,4 +163,4 @@ my_bool my_large_free_int(uchar *ptr)
...
@@ -163,4 +163,4 @@ my_bool my_large_free_int(uchar *ptr)
}
}
#endif
/* HAVE_DECL_SHM_HUGETLB */
#endif
/* HAVE_DECL_SHM_HUGETLB */
#endif
/* HAVE_LARGE_PAGES */
#endif
/* HAVE_L
INUX_L
ARGE_PAGES */
mysys/my_static.c
View file @
e895041b
...
@@ -59,7 +59,7 @@ USED_MEM* my_once_root_block=0; /* pointer to first block */
...
@@ -59,7 +59,7 @@ USED_MEM* my_once_root_block=0; /* pointer to first block */
uint
my_once_extra
=
ONCE_ALLOC_INIT
;
/* Memory to alloc / block */
uint
my_once_extra
=
ONCE_ALLOC_INIT
;
/* Memory to alloc / block */
/* from my_largepage.c */
/* from my_largepage.c */
#ifdef HAVE_LARGE_PAGES
#ifdef HAVE_L
INUX_L
ARGE_PAGES
my_bool
my_use_large_pages
=
0
;
my_bool
my_use_large_pages
=
0
;
uint
my_large_page_size
=
0
;
uint
my_large_page_size
=
0
;
#endif
#endif
...
...
sql/mysqld.cc
View file @
e895041b
...
@@ -4386,7 +4386,7 @@ static int init_common_variables()
...
@@ -4386,7 +4386,7 @@ static int init_common_variables()
DBUG_PRINT
(
"info"
,(
"%s Ver %s for %s on %s
\n
"
,
my_progname
,
DBUG_PRINT
(
"info"
,(
"%s Ver %s for %s on %s
\n
"
,
my_progname
,
server_version
,
SYSTEM_TYPE
,
MACHINE_TYPE
));
server_version
,
SYSTEM_TYPE
,
MACHINE_TYPE
));
#ifdef HAVE_LARGE_PAGES
#ifdef HAVE_L
INUX_L
ARGE_PAGES
/* Initialize large page size */
/* Initialize large page size */
if
(
opt_large_pages
)
if
(
opt_large_pages
)
{
{
...
@@ -4401,7 +4401,7 @@ static int init_common_variables()
...
@@ -4401,7 +4401,7 @@ static int init_common_variables()
else
else
SYSVAR_AUTOSIZE
(
opt_large_pages
,
0
);
SYSVAR_AUTOSIZE
(
opt_large_pages
,
0
);
}
}
#endif
/* HAVE_LARGE_PAGES */
#endif
/* HAVE_L
INUX_L
ARGE_PAGES */
#ifdef HAVE_SOLARIS_LARGE_PAGES
#ifdef HAVE_SOLARIS_LARGE_PAGES
#define LARGE_PAGESIZE (4*1024*1024)
/* 4MB */
#define LARGE_PAGESIZE (4*1024*1024)
/* 4MB */
#define SUPER_LARGE_PAGESIZE (256*1024*1024)
/* 256MB */
#define SUPER_LARGE_PAGESIZE (256*1024*1024)
/* 256MB */
...
...
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