Merge pull request #19283 from liviuconcioiu/18897

MauricioFauth · web-flow · commit e2ff85bfbcd7 · 2024-09-06T11:24:38.000-03:00
Fix #18897 - Unknown storage engine InnoDB
diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php
@@ -405,8 +405,7 @@ public function flushPrivileges($flushPrivileges)
     {
         if ($flushPrivileges) {
             // Flush the Privileges
-            $flushPrivQuery = 'FLUSH PRIVILEGES;';
-            $this->dbi->query($flushPrivQuery);
+            $this->dbi->tryQuery('FLUSH PRIVILEGES;');
 
             $message = Message::success(
                 __(
diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
@@ -345,8 +345,7 @@ public function adjustPrivilegesMoveDb($oldDb, $newname): void
         $this->dbi->query($query_proc_specific);
 
         // Finally FLUSH the new privileges
-        $flush_query = 'FLUSH PRIVILEGES;';
-        $this->dbi->query($flush_query);
+        $this->dbi->tryQuery('FLUSH PRIVILEGES;');
     }
 
     /**
@@ -442,8 +441,7 @@ public function adjustPrivilegesCopyDb($oldDb, $newname): void
         }
 
         // Finally FLUSH the new privileges
-        $flush_query = 'FLUSH PRIVILEGES;';
-        $this->dbi->query($flush_query);
+        $this->dbi->tryQuery('FLUSH PRIVILEGES;');
     }
 
     /**
@@ -816,8 +814,7 @@ public function adjustPrivilegesRenameOrMoveTable($oldDb, $oldTable, $newDb, $ne
         $this->dbi->query($query_col_specific);
 
         // Finally FLUSH the new privileges
-        $flush_query = 'FLUSH PRIVILEGES;';
-        $this->dbi->query($flush_query);
+        $this->dbi->tryQuery('FLUSH PRIVILEGES;');
     }
 
     /**
@@ -871,8 +868,7 @@ public function adjustPrivilegesCopyTable($oldDb, $oldTable, $newDb, $newTable):
         }
 
         // Finally FLUSH the new privileges
-        $flush_query = 'FLUSH PRIVILEGES;';
-        $this->dbi->query($flush_query);
+        $this->dbi->tryQuery('FLUSH PRIVILEGES;');
     }
 
     /**
diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
@@ -2477,8 +2477,7 @@ public function updateMessageForReload(): ?Message
     {
         $message = null;
         if (isset($_GET['flush_privileges'])) {
-            $sqlQuery = 'FLUSH PRIVILEGES;';
-            $this->dbi->query($sqlQuery);
+            $this->dbi->tryQuery('FLUSH PRIVILEGES;');
             $message = Message::success(
                 __('The privileges were reloaded successfully.')
             );

Original file line number	Diff line number	Diff line change
`@@ -405,8 +405,7 @@ public function flushPrivileges($flushPrivileges)`
`405`	`405`	`{`
`406`	`406`	`if ($flushPrivileges) {`
`407`	`407`	`// Flush the Privileges`
`408`		`- $flushPrivQuery = 'FLUSH PRIVILEGES;';`
`409`		`- $this->dbi->query($flushPrivQuery);`
	`408`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`410`	`409`
`411`	`410`	`$message = Message::success(`
`412`	`411`	`__(`
Original file line number	Diff line number	Diff line change
`@@ -345,8 +345,7 @@ public function adjustPrivilegesMoveDb($oldDb, $newname): void`
`345`	`345`	`$this->dbi->query($query_proc_specific);`
`346`	`346`
`347`	`347`	`// Finally FLUSH the new privileges`
`348`		`- $flush_query = 'FLUSH PRIVILEGES;';`
`349`		`- $this->dbi->query($flush_query);`
	`348`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`350`	`349`	`}`
`351`	`350`
`352`	`351`	`/**`
`@@ -442,8 +441,7 @@ public function adjustPrivilegesCopyDb($oldDb, $newname): void`
`442`	`441`	`}`
`443`	`442`
`444`	`443`	`// Finally FLUSH the new privileges`
`445`		`- $flush_query = 'FLUSH PRIVILEGES;';`
`446`		`- $this->dbi->query($flush_query);`
	`444`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`447`	`445`	`}`
`448`	`446`
`449`	`447`	`/**`
`@@ -816,8 +814,7 @@ public function adjustPrivilegesRenameOrMoveTable($oldDb, $oldTable, $newDb, $ne`
`816`	`814`	`$this->dbi->query($query_col_specific);`
`817`	`815`
`818`	`816`	`// Finally FLUSH the new privileges`
`819`		`- $flush_query = 'FLUSH PRIVILEGES;';`
`820`		`- $this->dbi->query($flush_query);`
	`817`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`821`	`818`	`}`
`822`	`819`
`823`	`820`	`/**`
`@@ -871,8 +868,7 @@ public function adjustPrivilegesCopyTable($oldDb, $oldTable, $newDb, $newTable):`
`871`	`868`	`}`
`872`	`869`
`873`	`870`	`// Finally FLUSH the new privileges`
`874`		`- $flush_query = 'FLUSH PRIVILEGES;';`
`875`		`- $this->dbi->query($flush_query);`
	`871`	`+ $this->dbi->tryQuery('FLUSH PRIVILEGES;');`
`876`	`872`	`}`
`877`	`873`
`878`	`874`	`/**`