Missing privileges on the mysql.host table for the PMA controluser when that table exists

Missing privileges on the `mysql.user` table for the PMA `controluser` when the `mysql.host` table doesn't exists

Author: nuxwin

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.1 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Missing privileges on the `mysql.host` table for the PMA `controluser` when that table exists
+- Missing privileges on the `mysql.user` table for the PMA `controluser` when the `mysql.host` table doesn't exists
+
 ## 1.0.0 - 20190328
 
 Initial release.

src/Handler.pm

@@ -475,11 +475,6 @@ sub _setupSqlUser
             undef, $self->{'_pma_control_user'},
             $dbUserHost
         );
-        $dbh->do(
-            'GRANT SELECT ON mysql.db TO ?@?',
-            undef, $self->{'_pma_control_user'},
-            $dbUserHost
-        );
         $dbh->do(
             '
                 GRANT SELECT (
@@ -493,18 +488,30 @@ sub _setupSqlUser
             ',
             undef, $self->{'_pma_control_user'}, $dbUserHost
         );
+        
+        $dbh->do(
+            'GRANT SELECT ON mysql.db TO ?@?',
+            undef, $self->{'_pma_control_user'},
+            $dbUserHost
+        );
 
         # Check for mysql.host table existence (as for MySQL >= 5.6.7, the
         # mysql.host table is no longer provided)
         if ( $dbh->selectrow_hashref( "SHOW tables FROM mysql LIKE 'host'" ) ) {
             $dbh->do(
-                'GRANT SELECT ON mysql.user TO ?@?',
+                'GRANT SELECT ON mysql.host TO ?@?',
                 undef,
                 $self->{'_pma_control_user'},
                 $dbUserHost
             );
         }
 
+        $dbh->do(
+            'GRANT SELECT ON mysql.user TO ?@?',
+            undef,
+            $self->{'_pma_control_user'},
+            $dbUserHost
+        );
         $dbh->do(
             '
                 GRANT SELECT (Host, Db, User, Table_name, Table_priv, Column_priv)