[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e22399: Add support for JSON field in MariaDB

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e22399bebead1f92a53f2d371334491394b998ae
      https://github.com/phpmyadmin/phpmyadmin/commit/e22399bebead1f92a53f2d371334491394b998ae
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M ChangeLog
    M libraries/TypesMySQL.php

  Log Message:
  -----------
  Add support for JSON field in MariaDB

Fixs #13038

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 4a624c6a58d3fb1148ff915af0755a78fa22fc6e
      https://github.com/phpmyadmin/phpmyadmin/commit/4a624c6a58d3fb1148ff915af0755a78fa22fc6e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-11-27 (Mon, 27 Nov 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_7'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d3f907516523...4a624c6a58d3