Add support for JSON field in MariaDB
Fixs #13038 Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
parent
4cd007c535
commit
9d7a84353f
@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
|
||||
- issue #13517 Fixed check all interaction with filtering
|
||||
- issue #13803 Add SJIS-win to default list of allowed charsets
|
||||
- issue #13436 Improve detection that MySQL server needs SSL connection
|
||||
- issue #13038 Support JSON datatype on MariaDB 10.2.7 and newer
|
||||
|
||||
4.7.5 (2017-10-23)
|
||||
- issue #13615 Avoid problems with browsing unknown query types
|
||||
|
||||
@ -535,8 +535,8 @@ class TypesMySQL extends Types
|
||||
'GEOMETRYCOLLECTION',
|
||||
);
|
||||
|
||||
if (PMA_MYSQL_INT_VERSION >= 50708
|
||||
&& \PMA\libraries\Util::getServerType() != 'MariaDB'
|
||||
if ((PMA_MYSQL_INT_VERSION >= 50708 && \PMA\libraries\Util::getServerType() != 'MariaDB') ||
|
||||
(PMA_MYSQL_INT_VERSION >= 100207 && \PMA\libraries\Util::getServerType() == 'MariaDB')
|
||||
) {
|
||||
$ret['JSON'] = array(
|
||||
'JSON',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user