diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 18:26:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 18:26:21 +0300 |
| commit | 742e1c727fc2be50b758068c2ab92abb19f3ff56 (patch) | |
| tree | b4efffa4eade915001faf0ceaf50715306416907 /plugin | |
| parent | 19283c67c6d196a49211da6f925ca59fceef3ea0 (diff) | |
| parent | 30914389fe9ca13cf29470dd033a5cf6997a3931 (diff) | |
| download | mariadb-git-742e1c727fc2be50b758068c2ab92abb19f3ff56.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/disks/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | plugin/type_mysql_json/type.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plugin/disks/CMakeLists.txt b/plugin/disks/CMakeLists.txt index 446c64d0fdd..d0f34b04027 100644 --- a/plugin/disks/CMakeLists.txt +++ b/plugin/disks/CMakeLists.txt @@ -1,5 +1,7 @@ -IF("${CMAKE_SYSTEM}" MATCHES "Linux") +INCLUDE (CheckIncludeFiles) +CHECK_INCLUDE_FILES ("sys/statvfs.h;mntent.h" INFO_HEADERS LANGUAGE CXX) + +IF (INFO_HEADERS) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql) MYSQL_ADD_PLUGIN(DISKS information_schema_disks.cc MODULE_ONLY RECOMPILE_FOR_EMBEDDED) ENDIF() - diff --git a/plugin/type_mysql_json/type.cc b/plugin/type_mysql_json/type.cc index ef8c97cfc1c..b897f64a3b2 100644 --- a/plugin/type_mysql_json/type.cc +++ b/plugin/type_mysql_json/type.cc @@ -223,6 +223,6 @@ maria_declare_plugin(type_mysql_json) NULL, NULL, "0.1", - MariaDB_PLUGIN_MATURITY_GAMMA + MariaDB_PLUGIN_MATURITY_STABLE } maria_declare_plugin_end; |