summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-07 09:25:46 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-07 09:25:46 +0300
commit71fc31ba360e7caf384ad2c0c44e7b01f34c7b43 (patch)
treeff864d9b5726c89aff9514c9939aadbb299dbc0d /plugin
parentdee24f31555ebbecb0843b34e35ba0ab21a9fe9a (diff)
parent0c0b697ae327e75388572da81a49b18640193ba5 (diff)
downloadmariadb-git-71fc31ba360e7caf384ad2c0c44e7b01f34c7b43.tar.gz
Merge 10.7 into 10.8
Diffstat (limited to 'plugin')
-rw-r--r--plugin/disks/information_schema_disks.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugin/disks/information_schema_disks.cc b/plugin/disks/information_schema_disks.cc
index 174264c3269..15e26dad12a 100644
--- a/plugin/disks/information_schema_disks.cc
+++ b/plugin/disks/information_schema_disks.cc
@@ -108,7 +108,7 @@ static int disks_table_add_row_stat(
#else
if (info.f_flags & MNT_RDONLY)
#endif
- return 0;
+ return 0;
pTable->field[0]->store(zDisk, strlen(zDisk), system_charset_info);
pTable->field[1]->store(zPath, strlen(zPath), system_charset_info);
@@ -214,15 +214,15 @@ static int disks_fill_table(THD* pThd, TABLE_LIST* pTables, Item* pCond)
)
{
struct stat f;
- const char *path, *point;
+ const char *path, *point;
#ifdef HAVE_SETMNTENT
- path= pEnt->mnt_dir;
- point= pEnt->mnt_fsname;
+ path= pEnt->mnt_dir;
+ point= pEnt->mnt_fsname;
#else
- path= pEnt->mnt_mountp;
- point= pEnt->mnt_special;
+ path= pEnt->mnt_mountp;
+ point= pEnt->mnt_special;
#endif
- // Try to keep to real storage by excluding
+ // Try to keep to real storage by excluding
// read only mounts, and mount points that aren't directories
if (hasmntopt(pEnt, MNTOPT_RO) != NULL)
continue;