[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a6e931: Fix offering JSON datatype in incompatible MySQL v...

[Madhura Jayaratne]

  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a6e9314cf37bce6a4683e13dcac14698de4ff21e
      https://github.com/phpmyadmin/phpmyadmin/commit/a6e9314cf37bce6a4683e13dcac14698de4ff21e
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-03-27 (Sun, 27 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/TypesMySQL.php

  Log Message:
  -----------
  Fix offering JSON datatype in incompatible MySQL versions

Fixes #12135

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: f4907d78578289083247a2334bef1ebc2349fd67
      https://github.com/phpmyadmin/phpmyadmin/commit/f4907d78578289083247a2334bef1ebc2349fd67
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2016-03-28 (Mon, 28 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/TypesMySQL.php

  Log Message:
  -----------
  Merge pull request #12136 from ibennetch/json

Fix offering JSON datatype in incompatible MySQL versions


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/43a4a042ceb3...f4907d785782