Skip to content

Commit

Permalink
MDEV-14533 Provide information_schema tables using which hardware
Browse files Browse the repository at this point in the history
information can be obtained.

plugin only enabled for Linux, as it fails building on BSD/MacOSX.
disks.test fixed.
  • Loading branch information
Alexey Botchkov committed Mar 23, 2018
1 parent 3b644ac commit 0b74a1f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion plugin/disks/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
2 changes: 0 additions & 2 deletions plugin/disks/mysql-test/disks/disks.result
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
install plugin DISKS soname 'disks';
show create table information_schema.disks;
Table Create Table
DISKS CREATE TEMPORARY TABLE `DISKS` (
Expand All @@ -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;
9 changes: 0 additions & 9 deletions plugin/disks/mysql-test/disks/disks.test
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 0b74a1f

Please sign in to comment.