diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:56:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-07 08:56:06 +0300 |
| commit | 0c0b697ae327e75388572da81a49b18640193ba5 (patch) | |
| tree | 15525ba618334046546019f74a9b450474279b39 /plugin | |
| parent | 5fdbb3a72ee5a532676242096aa92c6a3c6e4073 (diff) | |
| parent | 1985204044852f6be55453b3b843e81fd0fe1730 (diff) | |
| download | mariadb-git-0c0b697ae327e75388572da81a49b18640193ba5.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/disks/information_schema_disks.cc | 14 |
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; |