Skip to content

M
MariaDB
Commit 6d05a95c authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.5 into 10.6

parents 666565c7 e4205fba
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 203 deletions
cmake/Internal/CPack/CPackRPM.cmake
View file @ 6d05a95c
...@@ -24,6 +24,7 @@ endmacro() ...@@ -24,6 +24,7 @@ endmacro()
set_from_component(LICENSE) set_from_component(LICENSE)
set_from_component(VENDOR) set_from_component(VENDOR)
set_from_component(VERSION)
# #
# Support for the %posttrans scriptlet # Support for the %posttrans scriptlet
...@@ -80,6 +81,7 @@ set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH}) ...@@ -80,6 +81,7 @@ set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})
restore(LICENSE) restore(LICENSE)
restore(VENDOR) restore(VENDOR)
restore(VERSION)
if(${orig_${base_var}}) if(${orig_${base_var}})
set(${base_var} ${orig_${base_var}}) set(${base_var} ${orig_${base_var}})
endif() endif()
......
cmake/cpack_deb.cmake
View file @ 6d05a95c
...@@ -7,5 +7,18 @@ SET(CPACK_COMPONENT_SERVER_GROUP "server") ...@@ -7,5 +7,18 @@ SET(CPACK_COMPONENT_SERVER_GROUP "server")
SET(CPACK_COMPONENT_README_GROUP "server") SET(CPACK_COMPONENT_README_GROUP "server")
SET(CPACK_COMPONENTS_ALL Server Test SharedLibraries) SET(CPACK_COMPONENTS_ALL Server Test SharedLibraries)
SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang") SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang")
FUNCTION(SET_PLUGIN_DEB_VERSION plugin ver)
STRING(REPLACE "_" "-" plugin ${plugin})
STRING(REPLACE "-" "." serverver ${SERVER_VERSION})
STRING(REPLACE ${SERVER_VERSION} ${serverver} ver ${ver})
FILE(READ ${CMAKE_SOURCE_DIR}/debian/changelog changelog)
STRING(REPLACE ${serverver} ${ver} changelog "${changelog}")
FILE(WRITE ${CMAKE_SOURCE_DIR}/debian/mariadb-plugin-${plugin}.changelog "${changelog}")
ENDFUNCTION()
ELSE(DEB)
FUNCTION(SET_PLUGIN_DEB_VERSION plugin ver)
ENDFUNCTION()
ENDIF(DEB) ENDIF(DEB)
cmake/cpack_rpm.cmake
View file @ 6d05a95c
...@@ -33,13 +33,14 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts ...@@ -33,13 +33,14 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
) )
SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME}) SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
SET(CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
IF(CMAKE_VERSION VERSION_LESS "3.6.0") IF(CMAKE_VERSION VERSION_LESS "3.6.0")
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
ELSE() ELSE()
SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT") SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON) OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON)
MARK_AS_ADVANCED(CPACK_RPM_DEBUGINFO_PACKAGE) MARK_AS_ADVANCED(CPACK_RPM_DEBUGINFO_PACKAGE)
SET(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}") SET(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}")
ENDIF() ENDIF()
SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")
......
cmake/mysql_version.cmake
View file @ 6d05a95c
...@@ -57,6 +57,7 @@ IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR ...@@ -57,6 +57,7 @@ IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
ENDIF() ENDIF()
SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}") SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
SET(SERVER_VERSION ${VERSION})
MESSAGE(STATUS "MariaDB ${VERSION}") MESSAGE(STATUS "MariaDB ${VERSION}")
SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version") SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}") SET(MYSQL_NO_DASH_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}")
......
cmake/plugin.cmake
View file @ 6d05a95c
...@@ -28,13 +28,14 @@ INCLUDE(CMakeParseArguments) ...@@ -28,13 +28,14 @@ INCLUDE(CMakeParseArguments)
# [STATIC_OUTPUT_NAME static_name] # [STATIC_OUTPUT_NAME static_name]
# [COMPONENT component] # [COMPONENT component]
# [CONFIG cnf_file_name] # [CONFIG cnf_file_name]
# [VERSION version_string]
# [LINK_LIBRARIES lib1...libN] # [LINK_LIBRARIES lib1...libN]
# [DEPENDENCIES target1...targetN] # [DEPENDENCIES target1...targetN]
MACRO(MYSQL_ADD_PLUGIN) MACRO(MYSQL_ADD_PLUGIN)
CMAKE_PARSE_ARGUMENTS(ARG CMAKE_PARSE_ARGUMENTS(ARG
"STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_EMBEDDED;RECOMPILE_FOR_EMBEDDED;CLIENT" "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_EMBEDDED;RECOMPILE_FOR_EMBEDDED;CLIENT"
"MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG" "MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG;VERSION"
"LINK_LIBRARIES;DEPENDENCIES" "LINK_LIBRARIES;DEPENDENCIES"
${ARGN} ${ARGN}
) )
...@@ -118,6 +119,10 @@ MACRO(MYSQL_ADD_PLUGIN) ...@@ -118,6 +119,10 @@ MACRO(MYSQL_ADD_PLUGIN)
SET(ARG_DEPENDENCIES) SET(ARG_DEPENDENCIES)
ENDIF() ENDIF()
IF(ARG_VERSION)
SET(version_string ";PLUGIN_${plugin}_VERSION=\"${ARG_VERSION}\"")
ENDIF()
IF(NOT ARG_MODULE_OUTPUT_NAME) IF(NOT ARG_MODULE_OUTPUT_NAME)
IF(ARG_STORAGE_ENGINE) IF(ARG_STORAGE_ENGINE)
SET(ARG_MODULE_OUTPUT_NAME "ha_${target}") SET(ARG_MODULE_OUTPUT_NAME "ha_${target}")
...@@ -153,7 +158,7 @@ MACRO(MYSQL_ADD_PLUGIN) ...@@ -153,7 +158,7 @@ MACRO(MYSQL_ADD_PLUGIN)
DTRACE_INSTRUMENT(${target}_embedded) DTRACE_INSTRUMENT(${target}_embedded)
IF(ARG_RECOMPILE_FOR_EMBEDDED) IF(ARG_RECOMPILE_FOR_EMBEDDED)
SET_TARGET_PROPERTIES(${target}_embedded SET_TARGET_PROPERTIES(${target}_embedded
PROPERTIES COMPILE_DEFINITIONS "EMBEDDED_LIBRARY") PROPERTIES COMPILE_DEFINITIONS "EMBEDDED_LIBRARY${version_string}")
ENDIF() ENDIF()
ADD_DEPENDENCIES(${target}_embedded GenError) ADD_DEPENDENCIES(${target}_embedded GenError)
ENDIF() ENDIF()
...@@ -204,7 +209,7 @@ MACRO(MYSQL_ADD_PLUGIN) ...@@ -204,7 +209,7 @@ MACRO(MYSQL_ADD_PLUGIN)
SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "") SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "")
IF (NOT ARG_CLIENT) IF (NOT ARG_CLIENT)
SET_TARGET_PROPERTIES (${target} PROPERTIES SET_TARGET_PROPERTIES (${target} PROPERTIES
COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN") COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN${version_string}")
ENDIF() ENDIF()
TARGET_LINK_LIBRARIES (${target} mysqlservices ${ARG_LINK_LIBRARIES}) TARGET_LINK_LIBRARIES (${target} mysqlservices ${ARG_LINK_LIBRARIES})
...@@ -240,7 +245,8 @@ MACRO(MYSQL_ADD_PLUGIN) ...@@ -240,7 +245,8 @@ MACRO(MYSQL_ADD_PLUGIN)
NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT} NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT}
AND INSTALL_SYSCONF2DIR) AND INSTALL_SYSCONF2DIR)
IF (ARG_STORAGE_ENGINE) IF (ARG_STORAGE_ENGINE)
SET(ver " = %{version}-%{release}") STRING(REPLACE "-" "_" ver ${SERVER_VERSION})
SET(ver " = ${ver}-%{release}")
ELSE() ELSE()
SET(ver "") SET(ver "")
ENDIF() ENDIF()
...@@ -251,6 +257,10 @@ MACRO(MYSQL_ADD_PLUGIN) ...@@ -251,6 +257,10 @@ MACRO(MYSQL_ADD_PLUGIN)
SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server${ver}" PARENT_SCOPE) SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server${ver}" PARENT_SCOPE)
ENDIF() ENDIF()
SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE) SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE)
IF (ARG_VERSION)
SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_VERSION ${SERVER_VERSION}_${ARG_VERSION} PARENT_SCOPE)
SET_PLUGIN_DEB_VERSION(${target} ${SERVER_VERSION}-${ARG_VERSION})
ENDIF()
IF(NOT ARG_CLIENT AND UNIX) IF(NOT ARG_CLIENT AND UNIX)
IF (NOT ARG_CONFIG) IF (NOT ARG_CONFIG)
SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.cnf") SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.cnf")
......
debian/autobake-deb.sh
View file @ 6d05a95c
...@@ -91,10 +91,11 @@ PATCHLEVEL="+maria" ...@@ -91,10 +91,11 @@ PATCHLEVEL="+maria"
LOGSTRING="MariaDB build" LOGSTRING="MariaDB build"
CODENAME="$(lsb_release -sc)" CODENAME="$(lsb_release -sc)"
EPOCH="1:" EPOCH="1:"
VERSION="${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}"
dch -b -D "${CODENAME}" -v "${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME}" "Automatic build with ${LOGSTRING}." dch -b -D "${CODENAME}" -v "${VERSION}" "Automatic build with ${LOGSTRING}."
echo "Creating package version ${EPOCH}${UPSTREAM}${PATCHLEVEL}~${CODENAME} ... " echo "Creating package version ${VERSION} ... "
# On Travis CI and Gitlab-CI, use -b to build binary only packages as there is # On Travis CI and Gitlab-CI, use -b to build binary only packages as there is
# no need to waste time on generating the source package. # no need to waste time on generating the source package.
......
debian/control
View file @ 6d05a95c
...@@ -10,18 +10,18 @@ Build-Depends: bison, ...@@ -10,18 +10,18 @@ Build-Depends: bison,
dh-apparmor, dh-apparmor,
dh-exec, dh-exec,
dh-systemd, dh-systemd,
flex [i386 amd64], flex [amd64],
gdb, gdb,
libaio-dev [linux-any], libaio-dev [linux-any],
libarchive-dev, libarchive-dev,
libboost-atomic-dev [i386 amd64], libboost-atomic-dev [amd64],
libboost-chrono-dev [i386 amd64], libboost-chrono-dev [amd64],
libboost-date-time-dev [i386 amd64], libboost-date-time-dev [amd64],
libboost-dev, libboost-dev,
libboost-filesystem-dev [i386 amd64], libboost-filesystem-dev [amd64],
libboost-regex-dev [i386 amd64], libboost-regex-dev [amd64],
libboost-system-dev [i386 amd64], libboost-system-dev [amd64],
libboost-thread-dev [i386 amd64], libboost-thread-dev [amd64],
libcrack2-dev (>= 2.9.0), libcrack2-dev (>= 2.9.0),
libcurl4-openssl-dev | libcurl4-dev, libcurl4-openssl-dev | libcurl4-dev,
libedit-dev, libedit-dev,
...@@ -35,7 +35,7 @@ Build-Depends: bison, ...@@ -35,7 +35,7 @@ Build-Depends: bison,
libnuma-dev [linux-any], libnuma-dev [linux-any],
libpam0g-dev, libpam0g-dev,
libpcre2-dev, libpcre2-dev,
libreadline-gplv2-dev [i386 amd64], libreadline-gplv2-dev [amd64],
libsnappy-dev, libsnappy-dev,
libssl-dev, libssl-dev,
libssl-dev:native, libssl-dev:native,
...@@ -448,7 +448,7 @@ Depends: galera-4 (>=26.4), ...@@ -448,7 +448,7 @@ Depends: galera-4 (>=26.4),
lsb-base (>= 3.0-10), lsb-base (>= 3.0-10),
lsof [linux-any], lsof [linux-any],
mariadb-client-10.6 (>= ${source:Version}), mariadb-client-10.6 (>= ${source:Version}),
mariadb-server-core-10.6 (>= ${binary:Version}), mariadb-server-core-10.6 (>= ${server:Version}),
passwd, passwd,
perl (>= 5.6), perl (>= 5.6),
procps, procps,
...@@ -554,7 +554,7 @@ Description: Backup tool for MariaDB server ...@@ -554,7 +554,7 @@ Description: Backup tool for MariaDB server
Package: mariadb-plugin-connect Package: mariadb-plugin-connect
Architecture: any Architecture: any
Depends: libxml2, Depends: libxml2,
mariadb-server-10.6 (= ${binary:Version}), mariadb-server-10.6 (= ${server:Version}),
unixodbc, unixodbc,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
...@@ -575,7 +575,7 @@ Description: Connect storage engine for MariaDB ...@@ -575,7 +575,7 @@ Description: Connect storage engine for MariaDB
Package: mariadb-plugin-s3 Package: mariadb-plugin-s3
Architecture: any Architecture: any
Depends: libcurl4, Depends: libcurl4,
mariadb-server-10.6 (= ${binary:Version}), mariadb-server-10.6 (= ${server:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Description: Amazon S3 archival storage engine for MariaDB Description: Amazon S3 archival storage engine for MariaDB
...@@ -585,7 +585,7 @@ Description: Amazon S3 archival storage engine for MariaDB ...@@ -585,7 +585,7 @@ Description: Amazon S3 archival storage engine for MariaDB
Package: mariadb-plugin-rocksdb Package: mariadb-plugin-rocksdb
Architecture: amd64 arm64 mips64el ppc64el Architecture: amd64 arm64 mips64el ppc64el
Depends: mariadb-server-10.6 (= ${binary:Version}), Depends: mariadb-server-10.6 (= ${server:Version}),
python3, python3,
rocksdb-tools, rocksdb-tools,
${misc:Depends}, ${misc:Depends},
...@@ -605,7 +605,7 @@ Description: RocksDB storage engine for MariaDB ...@@ -605,7 +605,7 @@ Description: RocksDB storage engine for MariaDB
Package: mariadb-plugin-oqgraph Package: mariadb-plugin-oqgraph
Architecture: any Architecture: any
Depends: libjudydebian1, Depends: libjudydebian1,
mariadb-server-10.6 (= ${binary:Version}), mariadb-server-10.6 (= ${server:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-oqgraph-engine-10.1, Breaks: mariadb-oqgraph-engine-10.1,
...@@ -623,7 +623,7 @@ Description: OQGraph storage engine for MariaDB ...@@ -623,7 +623,7 @@ Description: OQGraph storage engine for MariaDB
Package: mariadb-plugin-mroonga Package: mariadb-plugin-mroonga
Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx
Depends: mariadb-server-10.6 (= ${binary:Version}), Depends: mariadb-server-10.6 (= ${server:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-server-10.0, Breaks: mariadb-server-10.0,
...@@ -643,7 +643,7 @@ Description: Mroonga storage engine for MariaDB ...@@ -643,7 +643,7 @@ Description: Mroonga storage engine for MariaDB
Package: mariadb-plugin-spider Package: mariadb-plugin-spider
Architecture: any Architecture: any
Depends: mariadb-server-10.6 (= ${binary:Version}), Depends: mariadb-server-10.6 (= ${server:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-server-10.0, Breaks: mariadb-server-10.0,
...@@ -665,7 +665,7 @@ Description: Spider storage engine for MariaDB ...@@ -665,7 +665,7 @@ Description: Spider storage engine for MariaDB
Package: mariadb-plugin-gssapi-server Package: mariadb-plugin-gssapi-server
Architecture: any Architecture: any
Depends: libgssapi-krb5-2, Depends: libgssapi-krb5-2,
mariadb-server-10.6 (= ${binary:Version}), mariadb-server-10.6,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Breaks: mariadb-gssapi-server-10.1, Breaks: mariadb-gssapi-server-10.1,
...@@ -706,7 +706,7 @@ Description: GSSAPI authentication plugin for MariaDB client ...@@ -706,7 +706,7 @@ Description: GSSAPI authentication plugin for MariaDB client
Package: mariadb-plugin-cracklib-password-check Package: mariadb-plugin-cracklib-password-check
Architecture: any Architecture: any
Depends: libcrack2 (>= 2.9.0), Depends: libcrack2 (>= 2.9.0),
mariadb-server-10.6 (= ${binary:Version}), mariadb-server-10.6,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Description: CrackLib Password Validation Plugin for MariaDB Description: CrackLib Password Validation Plugin for MariaDB
...@@ -718,7 +718,7 @@ Description: CrackLib Password Validation Plugin for MariaDB ...@@ -718,7 +718,7 @@ Description: CrackLib Password Validation Plugin for MariaDB
Package: mariadb-test Package: mariadb-test
Architecture: any Architecture: any
Depends: mariadb-client-10.6 (= ${binary:Version}), Depends: mariadb-client-10.6 (= ${binary:Version}),
mariadb-server-10.6 (= ${binary:Version}), mariadb-server-10.6 (= ${server:Version}),
mariadb-test-data (= ${source:Version}), mariadb-test-data (= ${source:Version}),
virtual-mysql-testsuite, virtual-mysql-testsuite,
${misc:Depends}, ${misc:Depends},
......
debian/rules
View file @ 6d05a95c
...@@ -82,6 +82,7 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) ...@@ -82,6 +82,7 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native
dh_auto_build --builddirectory=builddir-native -- import_executables dh_auto_build --builddirectory=builddir-native -- import_executables
endif endif
echo "server:Version=$(DEB_VERSION)" >> debian/substvars
# Don't build ColumnStore as part of the native build, only build it when # Don't build ColumnStore as part of the native build, only build it when
# triggered by autobake-deb.sh. Saves build time and disk space. # triggered by autobake-deb.sh. Saves build time and disk space.
...@@ -186,6 +187,8 @@ override_dh_installinit-arch: ...@@ -186,6 +187,8 @@ override_dh_installinit-arch:
dh_installinit --name=mariadb --no-start -- defaults 19 21 dh_installinit --name=mariadb --no-start -- defaults 19 21
dh_systemd_start --restart-after-upgrade dh_systemd_start --restart-after-upgrade
override_dh_gencontrol:
dh_gencontrol -- -Tdebian/substvars
# If a file is not supposed to be included anywhere, add it to the not-installed # If a file is not supposed to be included anywhere, add it to the not-installed
# file and document the reason. Note that dh_install supports the above mentioned # file and document the reason. Note that dh_install supports the above mentioned
......
mysql-test/suite/sys_vars/r/innodb_idle_flush_pct_basic.result deleted 100644 → 0
View file @ 666565c7
SET @start_global_value = @@global.innodb_idle_flush_pct;
SELECT @start_global_value;
@start_global_value
100
Valid values are between 0 and 100
select @@global.innodb_idle_flush_pct between 0 and 100;
@@global.innodb_idle_flush_pct between 0 and 100
1
select @@global.innodb_idle_flush_pct;
@@global.innodb_idle_flush_pct
100
select @@session.innodb_idle_flush_pct;
ERROR HY000: Variable 'innodb_idle_flush_pct' is a GLOBAL variable
show global variables like 'innodb_idle_flush_pct';
Variable_name Value
innodb_idle_flush_pct 100
show session variables like 'innodb_idle_flush_pct';
Variable_name Value
innodb_idle_flush_pct 100
select * from information_schema.global_variables where variable_name='innodb_idle_flush_pct';
VARIABLE_NAME VARIABLE_VALUE
INNODB_IDLE_FLUSH_PCT 100
select * from information_schema.session_variables where variable_name='innodb_idle_flush_pct';
VARIABLE_NAME VARIABLE_VALUE
INNODB_IDLE_FLUSH_PCT 100
set global innodb_idle_flush_pct=10;
select @@global.innodb_idle_flush_pct;
@@global.innodb_idle_flush_pct
10
select * from information_schema.global_variables where variable_name='innodb_idle_flush_pct';
VARIABLE_NAME VARIABLE_VALUE
INNODB_IDLE_FLUSH_PCT 10
select * from information_schema.session_variables where variable_name='innodb_idle_flush_pct';
VARIABLE_NAME VARIABLE_VALUE
INNODB_IDLE_FLUSH_PCT 10
set session innodb_idle_flush_pct=1;
ERROR HY000: Variable 'innodb_idle_flush_pct' is a GLOBAL variable and should be set with SET GLOBAL
set global innodb_idle_flush_pct=1.1;
ERROR 42000: Incorrect argument type to variable 'innodb_idle_flush_pct'
set global innodb_idle_flush_pct=1e1;
ERROR 42000: Incorrect argument type to variable 'innodb_idle_flush_pct'
set global innodb_idle_flush_pct="bar";
ERROR 42000: Incorrect argument type to variable 'innodb_idle_flush_pct'
set global innodb_idle_flush_pct=-7;
Warnings:
Warning 1292 Truncated incorrect innodb_idle_flush_pct value: '-7'
select @@global.innodb_idle_flush_pct;
@@global.innodb_idle_flush_pct
0
select * from information_schema.global_variables where variable_name='innodb_idle_flush_pct';
VARIABLE_NAME VARIABLE_VALUE
INNODB_IDLE_FLUSH_PCT 0
set global innodb_idle_flush_pct=106;
Warnings:
Warning 1292 Truncated incorrect innodb_idle_flush_pct value: '106'
select @@global.innodb_idle_flush_pct;
@@global.innodb_idle_flush_pct
100
select * from information_schema.global_variables where variable_name='innodb_idle_flush_pct';
VARIABLE_NAME VARIABLE_VALUE
INNODB_IDLE_FLUSH_PCT 100
set global innodb_idle_flush_pct=0;
select @@global.innodb_idle_flush_pct;
@@global.innodb_idle_flush_pct
0
set global innodb_idle_flush_pct=100;
select @@global.innodb_idle_flush_pct;
@@global.innodb_idle_flush_pct
100
set global innodb_idle_flush_pct=DEFAULT;
select @@global.innodb_idle_flush_pct;
@@global.innodb_idle_flush_pct
100
SET @@global.innodb_idle_flush_pct = @start_global_value;
SELECT @@global.innodb_idle_flush_pct;
@@global.innodb_idle_flush_pct
100
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
View file @ 6d05a95c
...@@ -188,15 +188,6 @@ ...@@ -188,15 +188,6 @@
VARIABLE_COMMENT Total memory allocated for InnoDB Fulltext Search cache VARIABLE_COMMENT Total memory allocated for InnoDB Fulltext Search cache
NUMERIC_MIN_VALUE 32000000 NUMERIC_MIN_VALUE 32000000
NUMERIC_MAX_VALUE 1600000000 NUMERIC_MAX_VALUE 1600000000
@@ -1057,7 +1057,7 @@
SESSION_VALUE NULL
DEFAULT_VALUE 100
VARIABLE_SCOPE GLOBAL
-VARIABLE_TYPE BIGINT UNSIGNED
+VARIABLE_TYPE INT UNSIGNED
VARIABLE_COMMENT Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so.
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100
@@ -1093,22 +1093,22 @@ @@ -1093,22 +1093,22 @@
SESSION_VALUE NULL SESSION_VALUE NULL
DEFAULT_VALUE 200 DEFAULT_VALUE 200
......
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View file @ 6d05a95c
...@@ -945,18 +945,6 @@ NUMERIC_BLOCK_SIZE NULL ...@@ -945,18 +945,6 @@ NUMERIC_BLOCK_SIZE NULL
ENUM_VALUE_LIST NULL ENUM_VALUE_LIST NULL
READ_ONLY NO READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_IDLE_FLUSH_PCT
SESSION_VALUE NULL
DEFAULT_VALUE 100
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Up to what percentage of dirty pages should be flushed when innodb finds it has spare resources to do so.
NUMERIC_MIN_VALUE 0
NUMERIC_MAX_VALUE 100
NUMERIC_BLOCK_SIZE 0
ENUM_VALUE_LIST NULL
READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME INNODB_IMMEDIATE_SCRUB_DATA_UNCOMPRESSED VARIABLE_NAME INNODB_IMMEDIATE_SCRUB_DATA_UNCOMPRESSED
SESSION_VALUE NULL SESSION_VALUE NULL
DEFAULT_VALUE OFF DEFAULT_VALUE OFF
......
mysql-test/suite/sys_vars/t/innodb_idle_flush_pct_basic.test deleted 100644 → 0
View file @ 666565c7
#
# 2013-04-01 - Added
#
--source include/have_innodb.inc
SET @start_global_value = @@global.innodb_idle_flush_pct;
SELECT @start_global_value;
#
# exists as global only
#
--echo Valid values are between 0 and 100
select @@global.innodb_idle_flush_pct between 0 and 100;
select @@global.innodb_idle_flush_pct;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
select @@session.innodb_idle_flush_pct;
show global variables like 'innodb_idle_flush_pct';
show session variables like 'innodb_idle_flush_pct';
select * from information_schema.global_variables where variable_name='innodb_idle_flush_pct';
select * from information_schema.session_variables where variable_name='innodb_idle_flush_pct';
#
# show that it's writable
#
set global innodb_idle_flush_pct=10;
select @@global.innodb_idle_flush_pct;
select * from information_schema.global_variables where variable_name='innodb_idle_flush_pct';
select * from information_schema.session_variables where variable_name='innodb_idle_flush_pct';
--error ER_GLOBAL_VARIABLE
set session innodb_idle_flush_pct=1;
#
# incorrect types
#
--error ER_WRONG_TYPE_FOR_VAR
set global innodb_idle_flush_pct=1.1;
--error ER_WRONG_TYPE_FOR_VAR
set global innodb_idle_flush_pct=1e1;
--error ER_WRONG_TYPE_FOR_VAR
set global innodb_idle_flush_pct="bar";
set global innodb_idle_flush_pct=-7;
select @@global.innodb_idle_flush_pct;
select * from information_schema.global_variables where variable_name='innodb_idle_flush_pct';
set global innodb_idle_flush_pct=106;
select @@global.innodb_idle_flush_pct;
select * from information_schema.global_variables where variable_name='innodb_idle_flush_pct';
#
# min/max/DEFAULT values
#
set global innodb_idle_flush_pct=0;
select @@global.innodb_idle_flush_pct;
set global innodb_idle_flush_pct=100;
select @@global.innodb_idle_flush_pct;
set global innodb_idle_flush_pct=DEFAULT;
select @@global.innodb_idle_flush_pct;
SET @@global.innodb_idle_flush_pct = @start_global_value;
SELECT @@global.innodb_idle_flush_pct;
sql/mysqld.cc
View file @ 6d05a95c
/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. /* Copyright (c) 2000, 2015, Oracle and/or its affiliates.
Copyright (c) 2008, 2020, MariaDB Copyright (c) 2008, 2021, MariaDB
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -5016,6 +5016,7 @@ static int init_server_components() ...@@ -5016,6 +5016,7 @@ static int init_server_components()
#if defined(__linux__) #if defined(__linux__)
MARIADB_REMOVED_OPTION("super-large-pages"), MARIADB_REMOVED_OPTION("super-large-pages"),
#endif #endif
MARIADB_REMOVED_OPTION("innodb-idle-flush-pct"),
MARIADB_REMOVED_OPTION("innodb-locks-unsafe-for-binlog"), MARIADB_REMOVED_OPTION("innodb-locks-unsafe-for-binlog"),
MARIADB_REMOVED_OPTION("innodb-rollback-segments"), MARIADB_REMOVED_OPTION("innodb-rollback-segments"),
MARIADB_REMOVED_OPTION("innodb-stats-sample-pages"), MARIADB_REMOVED_OPTION("innodb-stats-sample-pages"),
......
sql/upgrade_conf_file.cc
View file @ 6d05a95c
...@@ -84,6 +84,7 @@ static const char *removed_variables[] = ...@@ -84,6 +84,7 @@ static const char *removed_variables[] =
"innodb_ibuf_accel_rate", "innodb_ibuf_accel_rate",
"innodb_ibuf_active_contract", "innodb_ibuf_active_contract",
"innodb_ibuf_max_size", "innodb_ibuf_max_size",
"innodb_idle_flush_pct",
"innodb_import_table_from_xtrabackup", "innodb_import_table_from_xtrabackup",
"innodb_instrument_semaphores", "innodb_instrument_semaphores",
"innodb_kill_idle_transaction", "innodb_kill_idle_transaction",
......
storage/columnstore/CMakeLists.txt
View file @ 6d05a95c
...@@ -27,6 +27,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") ...@@ -27,6 +27,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/preInstall_storage_engine.sh PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/preInstall_storage_engine.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/postInstall_storage_engine.sh PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/postInstall_storage_engine.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/preUn_storage_engine.sh PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/preUn_storage_engine.sh PARENT_SCOPE)
APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_VERSION "")
ENDIF() ENDIF()
INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/columnstore") INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/columnstore")
ENDIF() ENDIF()
......
columnstore @ ea708da6
Subproject commit f6f91f543283e077e3300a987c56b051435d3192 Subproject commit ea708da6e30fd579c5fb4b6cecb3c06d4649418d
storage/innobase/handler/ha_innodb.cc
View file @ 6d05a95c
...@@ -18198,13 +18198,6 @@ static MYSQL_SYSVAR_ULONG(io_capacity_max, srv_max_io_capacity, ...@@ -18198,13 +18198,6 @@ static MYSQL_SYSVAR_ULONG(io_capacity_max, srv_max_io_capacity,
SRV_MAX_IO_CAPACITY_DUMMY_DEFAULT, 100, SRV_MAX_IO_CAPACITY_DUMMY_DEFAULT, 100,
SRV_MAX_IO_CAPACITY_LIMIT, 0); SRV_MAX_IO_CAPACITY_LIMIT, 0);
static MYSQL_SYSVAR_ULONG(idle_flush_pct,
srv_idle_flush_pct,
PLUGIN_VAR_RQCMDARG,
"Up to what percentage of dirty pages should be flushed when innodb "
"finds it has spare resources to do so.",
NULL, NULL, 100, 0, 100, 0);
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
static MYSQL_SYSVAR_BOOL(background_drop_list_empty, static MYSQL_SYSVAR_BOOL(background_drop_list_empty,
innodb_background_drop_list_empty, innodb_background_drop_list_empty,
...@@ -19239,7 +19232,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= { ...@@ -19239,7 +19232,6 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
MYSQL_SYSVAR(instant_alter_column_allowed), MYSQL_SYSVAR(instant_alter_column_allowed),
MYSQL_SYSVAR(io_capacity), MYSQL_SYSVAR(io_capacity),
MYSQL_SYSVAR(io_capacity_max), MYSQL_SYSVAR(io_capacity_max),
MYSQL_SYSVAR(idle_flush_pct),
MYSQL_SYSVAR(monitor_enable), MYSQL_SYSVAR(monitor_enable),
MYSQL_SYSVAR(monitor_disable), MYSQL_SYSVAR(monitor_disable),
MYSQL_SYSVAR(monitor_reset), MYSQL_SYSVAR(monitor_reset),
......
storage/innobase/include/srv0srv.h
View file @ 6d05a95c
...@@ -372,8 +372,6 @@ extern double srv_defragment_fill_factor; ...@@ -372,8 +372,6 @@ extern double srv_defragment_fill_factor;
extern uint srv_defragment_frequency; extern uint srv_defragment_frequency;
extern ulonglong srv_defragment_interval; extern ulonglong srv_defragment_interval;
extern ulong srv_idle_flush_pct;
extern uint srv_change_buffer_max_size; extern uint srv_change_buffer_max_size;
/* Number of IO operations per second the server can do */ /* Number of IO operations per second the server can do */
......
storage/innobase/srv/srv0srv.cc
View file @ 6d05a95c
...@@ -219,9 +219,6 @@ ulong srv_buf_pool_load_pages_abort = LONG_MAX; ...@@ -219,9 +219,6 @@ ulong srv_buf_pool_load_pages_abort = LONG_MAX;
/** Lock table size in bytes */ /** Lock table size in bytes */
ulint srv_lock_table_size = ULINT_MAX; ulint srv_lock_table_size = ULINT_MAX;
/** innodb_idle_flush_pct */
ulong srv_idle_flush_pct;
/** innodb_read_io_threads */ /** innodb_read_io_threads */
uint srv_n_read_io_threads; uint srv_n_read_io_threads;
/** innodb_write_io_threads */ /** innodb_write_io_threads */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7