diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2018-03-24 00:37:38 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2018-03-24 00:37:38 +0400 |
| commit | 0b74a1fa64fdb21a43c8880274d1639fb9ef816e (patch) | |
| tree | e2d254cc8b4a66900ea98af46f85cc481248344e /plugin/disks | |
| parent | 3b644ac1f71f2259f66f53a19c78eed90f7a692c (diff) | |
| download | mariadb-git-0b74a1fa64fdb21a43c8880274d1639fb9ef816e.tar.gz | |
MDEV-14533 Provide information_schema tables using which hardware
information can be obtained.
plugin only enabled for Linux, as it fails building on BSD/MacOSX.
disks.test fixed.
Diffstat (limited to 'plugin/disks')
| -rw-r--r-- | plugin/disks/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/disks/mysql-test/disks/disks.result | 2 | ||||
| -rw-r--r-- | plugin/disks/mysql-test/disks/disks.test | 9 |
3 files changed, 1 insertions, 12 deletions
diff --git a/plugin/disks/CMakeLists.txt b/plugin/disks/CMakeLists.txt index a0ed929c62c..446c64d0fdd 100644 --- a/plugin/disks/CMakeLists.txt +++ b/plugin/disks/CMakeLists.txt @@ -1,4 +1,4 @@ -IF(NOT WIN32) +IF("${CMAKE_SYSTEM}" MATCHES "Linux") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql) MYSQL_ADD_PLUGIN(DISKS information_schema_disks.cc MODULE_ONLY RECOMPILE_FOR_EMBEDDED) ENDIF() diff --git a/plugin/disks/mysql-test/disks/disks.result b/plugin/disks/mysql-test/disks/disks.result index 53e73ec6f66..bd6befc5e11 100644 --- a/plugin/disks/mysql-test/disks/disks.result +++ b/plugin/disks/mysql-test/disks/disks.result @@ -1,4 +1,3 @@ -install plugin DISKS soname 'disks'; show create table information_schema.disks; Table Create Table DISKS CREATE TEMPORARY TABLE `DISKS` ( @@ -11,4 +10,3 @@ DISKS CREATE TEMPORARY TABLE `DISKS` ( select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; sum(Total) > sum(Available) sum(Total)>sum(Used) 1 1 -uninstall plugin DISKS; diff --git a/plugin/disks/mysql-test/disks/disks.test b/plugin/disks/mysql-test/disks/disks.test index a2371b97584..13a0762ae01 100644 --- a/plugin/disks/mysql-test/disks/disks.test +++ b/plugin/disks/mysql-test/disks/disks.test @@ -1,11 +1,2 @@ ---source include/not_windows.inc - -if (!$DISKS_SO) { - skip No DISKS plugin; -} - -install plugin DISKS soname 'disks'; show create table information_schema.disks; select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; - -uninstall plugin DISKS; |