MySQL: Support foreign keys in NDB storage

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 341c32a698ac448a342a183b6ea688f285fab298..d8e355cc230ee9735697ad743393f4f8cbb678e4 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -447,7 +447,9 @@ if (!defined("DRIVER")) {
        * @return bool
        */
        function fk_support($table_status) {
-               return preg_match('~InnoDB|IBMDB2I~i', $table_status["Engine"]);
+               global $connection;
+               return preg_match('~InnoDB|IBMDB2I~i', $table_status["Engine"])
+                       || (preg_match('~NDB~i', $table_status["Engine"]) && version_compare($connection->server_info, '5.6') >= 0);
        }
 
        /** Get information about fields

diff --git a/changes.txt b/changes.txt
index e3c1067e6bc56a4597086c2c3853f69b6d83f6a5..95fca1697ece49a38e0ab575b6649052fe79b4a1 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -9,6 +9,7 @@ Send 403 for auth error
 Report offline and other AJAX errors (bug #419)
 Add links to documentation on table status page
 MySQL: Use utf8mb4 if available
+MySQL: Support foreign keys in NDB storage
 PostgreSQL: Materialized views
 SQLite: Support CURRENT_* default values (bug #417)
 Elasticsearch: Use where in select