Merge branch 'QA_4_6'

ChangeLog

@@ -14,6 +14,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

libraries/TypesMySQL.php

@@ -535,9 +535,13 @@ class TypesMySQL extends Types
             'GEOMETRYCOLLECTION',
         );
 
-        $ret['JSON'] = array(
-            'JSON',
-        );
+        if (PMA_MYSQL_INT_VERSION >= 50708
+            && \PMA\libraries\Util::getServerType() != 'MariaDB'
+        ) {
+          $ret['JSON'] = array(
+              'JSON',
+          );
+        }
 
         return $ret;
     }