From a6e9314cf37bce6a4683e13dcac14698de4ff21e Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Sun, 27 Mar 2016 12:27:49 -0400 Subject: [PATCH 1/2] Fix offering JSON datatype in incompatible MySQL versions Fixes #12135 Signed-off-by: Isaac Bennetch --- ChangeLog | 1 + libraries/TypesMySQL.php | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4568bce895..d370ef1d7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - issue #12120 PMA_Util not found in insert_edit.lib.php - issue #12118 Fixed activation of some languages - issue #12121 Fixed error in 3NF step of normalization +- issue #12135 Fix offering JSON datatype in incompatible MySQL versions 4.6.0.0 (2016-03-22) + issue #11456 Disabled storage engines diff --git a/libraries/TypesMySQL.php b/libraries/TypesMySQL.php index 86489363b3..be890bb18f 100644 --- a/libraries/TypesMySQL.php +++ b/libraries/TypesMySQL.php @@ -535,9 +535,12 @@ class TypesMySQL extends Types 'GEOMETRYCOLLECTION', ); - $ret['JSON'] = array( - 'JSON', - ); + if (PMA_MYSQL_INT_VERSION >= 50708 + ) { + $ret['JSON'] = array( + 'JSON', + ); + } return $ret; } From 61dbcafa5663e6f7b5ceed8452fafd6e9a0fc5da Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 28 Mar 2016 22:17:48 +1100 Subject: [PATCH 2/2] JSON data type is not supported in MariaDB Signed-off-by: Madhura Jayaratne --- libraries/TypesMySQL.php | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/TypesMySQL.php b/libraries/TypesMySQL.php index be890bb18f..a1ee7bacb3 100644 --- a/libraries/TypesMySQL.php +++ b/libraries/TypesMySQL.php @@ -536,6 +536,7 @@ class TypesMySQL extends Types ); if (PMA_MYSQL_INT_VERSION >= 50708 + && \PMA\libraries\Util::getServerType() != 'MariaDB' ) { $ret['JSON'] = array( 'JSON',