mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '10.8' into 10.9

Browse source
This commit is contained in:
Sergei Golubchik 2022-03-17 14:38:35 +01:00
commit df2a8d728c
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/columnstore/CMakeLists.txt
View file

@ -5,6 +5,10 @@ if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}")
endif() endif()
add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
IF(NOT PLUGIN_PERFSCHEMA STREQUAL NO)
add_definitions(-DHAVE_PSI_INTERFACE=)
ENDIF()
# this does everything, gets the var from the correct scope, appends new # this does everything, gets the var from the correct scope, appends new
# values, sets in the correct scope # values, sets in the correct scope

8
storage/innobase/os/os0file.cc
View file

@ -1290,13 +1290,13 @@ os_file_create_func(
#if (defined(UNIV_SOLARIS) && defined(DIRECTIO_ON)) || defined O_DIRECT #if (defined(UNIV_SOLARIS) && defined(DIRECTIO_ON)) || defined O_DIRECT
if (type == OS_DATA_FILE) { if (type == OS_DATA_FILE) {
# ifdef __linux__
use_o_direct:
# endif
switch (srv_file_flush_method) { switch (srv_file_flush_method) {
case SRV_O_DSYNC: case SRV_O_DSYNC:
case SRV_O_DIRECT: case SRV_O_DIRECT:
case SRV_O_DIRECT_NO_FSYNC: case SRV_O_DIRECT_NO_FSYNC:
# ifdef __linux__
use_o_direct:
# endif
os_file_set_nocache(file, name, mode_str); os_file_set_nocache(file, name, mode_str);
break; break;
default: default:
@ -1349,9 +1349,7 @@ use_o_direct:
goto skip_o_direct; goto skip_o_direct;
} }
log_sys.set_block_size(uint32_t(s)); log_sys.set_block_size(uint32_t(s));
if (srv_file_flush_method == SRV_O_DSYNC) {
goto use_o_direct; goto use_o_direct;
}
} else { } else {
skip_o_direct: skip_o_direct:
log_sys.set_block_size(0); log_sys.set_block_size(0);