Merge branch 'QA_4_8'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Apr 1, 2019 · 76dca69 · 76dca69
2 parents 292d2db + 7a8d6c2
commit 76dca69
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -86,6 +86,8 @@ phpMyAdmin - ChangeLog
 - issue #12729 Fixed sticky table header over dropdown menu
 - issue #15140 Fixed edit link does not work on failed insert
 - issue #14334 Fixed export table structure shows rows fields
+- issue #15010 Fixed empty SQL preview modal on tbl_relation
+- issue #14673 Fixed innodb & MySQL 8: DYNAMIC & COMPRESSED ROW_FORMAT missing
 
 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log

diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php
@@ -132,9 +132,7 @@ public function indexAction()
         }
 
         // updates for foreign keys
-        if (isset($_POST['destination_foreign_db'])) {
-            $this->updateForForeignKeysAction();
-        }
+        $this->updateForForeignKeysAction();
 
         // Updates for display field
         if ($this->cfgRelation['displaywork'] && isset($_POST['display_field'])) {
@@ -246,19 +244,23 @@ public function updateForForeignKeysAction()
 
         // (for now, one index name only; we keep the definitions if the
         // foreign db is not the same)
-        list($html, $preview_sql_data, $display_query, $seen_error)
-            = $this->upd_query->updateForeignKeys(
-                $_POST['destination_foreign_db'],
-                $multi_edit_columns_name,
-                $_POST['destination_foreign_table'],
-                $_POST['destination_foreign_column'],
-                $this->options_array,
-                $this->table,
-                isset($this->existrel_foreign)
-                ? $this->existrel_foreign['foreign_keys_data']
-                : null
-            );
-        $this->response->addHTML($html);
+        if (isset($_POST['destination_foreign_db'])
+            && isset($_POST['destination_foreign_table'])
+            && isset($_POST['destination_foreign_column'])) {
+            list($html, $preview_sql_data, $display_query, $seen_error)
+                = $this->upd_query->updateForeignKeys(
+                    $_POST['destination_foreign_db'],
+                    $multi_edit_columns_name,
+                    $_POST['destination_foreign_table'],
+                    $_POST['destination_foreign_column'],
+                    $this->options_array,
+                    $this->table,
+                    isset($this->existrel_foreign)
+                    ? $this->existrel_foreign['foreign_keys_data']
+                    : null
+                );
+            $this->response->addHTML($html);
+        }
 
         // If there is a request for SQL previewing.
         if (isset($_POST['preview_sql'])) {

diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
@@ -1290,7 +1290,12 @@ private function getPossibleRowFormat()
         } else {
             $innodb_file_format = '';
         }
-        if ('Barracuda' == $innodb_file_format
+        /**
+         * Newer MySQL/MariaDB always return empty a.k.a '' on $innodb_file_format otherwise
+         * old versions of MySQL/MariaDB must be returning something or not empty.
+         * This patch is to support newer MySQL/MariaDB while also for backward compatibilities.
+         */
+        if (( ('Barracuda' == $innodb_file_format) || ($innodb_file_format == '') )
             && $innodbEnginePlugin->supportsFilePerTable()
         ) {
             $possible_row_formats['INNODB']['DYNAMIC'] = 'DYNAMIC';