database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-21587: disk.disk{_notembedded} test result

Browse Source 
Allow for a CI system to be almost out of space, or having so
little use, that the Total space is the same as available or used.

Thanks Otto Kekäläinen for the bug report and testing.
This commit is contained in:
Daniel Black
2023-10-05 16:55:34 +03:00
parent 6193d0cabb
commit 7504985daf
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/disks/mysql-test/disks/disks.result
View File

@@ -7,6 +7,6 @@ DISKS CREATE TEMPORARY TABLE `DISKS` (
`Used` bigint(32) NOT NULL, `Used` bigint(32) NOT NULL,
`Available` bigint(32) NOT NULL `Available` bigint(32) NOT NULL
) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; select sum(Total) >= sum(Available), sum(Total)>=sum(Used) from information_schema.disks;
sum(Total) > sum(Available) sum(Total)>sum(Used) sum(Total) >= sum(Available) sum(Total)>=sum(Used)
1 1 1 1

2
plugin/disks/mysql-test/disks/disks.test
View File

@@ -1,3 +1,3 @@
--replace_regex /varchar\([0-9]+\)/varchar(pathlen)/ --replace_regex /varchar\([0-9]+\)/varchar(pathlen)/
show create table information_schema.disks; show create table information_schema.disks;
select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; select sum(Total) >= sum(Available), sum(Total)>=sum(Used) from information_schema.disks;

8
plugin/disks/mysql-test/disks/disks_notembedded.result
View File

@@ -6,16 +6,16 @@ CREATE USER user1@localhost;
GRANT SELECT ON *.* TO user1@localhost; GRANT SELECT ON *.* TO user1@localhost;
connect con1,localhost,user1,,; connect con1,localhost,user1,,;
connection con1; connection con1;
select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
sum(Total) > sum(Available) sum(Total)>sum(Used) sum(Total) >= sum(Available) sum(Total) >= sum(Used)
NULL NULL NULL NULL
disconnect con1; disconnect con1;
connection default; connection default;
GRANT FILE ON *.* TO user1@localhost; GRANT FILE ON *.* TO user1@localhost;
connect con1,localhost,user1,,; connect con1,localhost,user1,,;
connection con1; connection con1;
select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
sum(Total) > sum(Available) sum(Total)>sum(Used) sum(Total) >= sum(Available) sum(Total) >= sum(Used)
1 1 1 1
connection default; connection default;
DROP USER user1@localhost; DROP USER user1@localhost;

4
plugin/disks/mysql-test/disks/disks_notembedded.test
View File

@@ -10,7 +10,7 @@ GRANT SELECT ON *.* TO user1@localhost;
connect (con1,localhost,user1,,); connect (con1,localhost,user1,,);
connection con1; connection con1;
select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
disconnect con1; disconnect con1;
connection default; connection default;
@@ -18,7 +18,7 @@ GRANT FILE ON *.* TO user1@localhost;
connect (con1,localhost,user1,,); connect (con1,localhost,user1,,);
connection con1; connection con1;
select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks; select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
connection default; connection default;
DROP USER user1@localhost; DROP USER user1@localhost;