diff --git a/ChangeLog b/ChangeLog index d370ef1d7b..8b6b0fcd94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - 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 +- issue #12132 Can not open table with JSON field 4.6.0.0 (2016-03-22) + issue #11456 Disabled storage engines diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php index b0d55780de..ac36f2737e 100644 --- a/libraries/dbi/DBIMysqli.php +++ b/libraries/dbi/DBIMysqli.php @@ -43,7 +43,9 @@ if (! defined('MYSQLI_TYPE_NEWDECIMAL')) { if (! defined('MYSQLI_TYPE_BIT')) { define('MYSQLI_TYPE_BIT', 16); } - +if (! defined('MYSQLI_TYPE_JSON')) { + define('MYSQLI_TYPE_JSON', 245); +} /* vim: set expandtab sw=4 ts=4 sts=4: */ @@ -499,9 +501,7 @@ class DBIMysqli implements DBIExtension //$typeAr[MYSQLI_TYPE_CHAR] = 'string'; $typeAr[MYSQLI_TYPE_GEOMETRY] = 'geometry'; $typeAr[MYSQLI_TYPE_BIT] = 'bit'; - if (defined('MYSQLI_TYPE_JSON')) { - $typeAr[MYSQLI_TYPE_JSON] = 'json'; - } + $typeAr[MYSQLI_TYPE_JSON] = 'json'; $fields = mysqli_fetch_fields($result);