[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b5e391: Merge Types and TypesMySQL classes

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b5e391f0069f60f7cfb5d0ffaf36791e0ae6cd37
      https://github.com/phpmyadmin/phpmyadmin/commit/b5e391f0069f60f7cfb5d0ffaf36791e0ae6cd37
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M libraries/classes/Types.php
    R libraries/classes/TypesMySQL.php
    M libraries/common.inc.php
    M test/classes/CentralColumnsTest.php
    M test/classes/Controllers/Table/TableSearchControllerTest.php
    M test/classes/InsertEditTest.php
    M test/classes/NormalizationTest.php
    M test/classes/Rte/RoutinesTest.php
    R test/classes/TypesMySQLTest.php
    M test/classes/TypesTest.php

  Log Message:
  -----------
  Merge Types and TypesMySQL classes

These were separate from time we've supported Drizzle, but this no
longer makes sense.

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


  Commit: 735db02112d90b43c84b4d419a2346c183dc0472
      https://github.com/phpmyadmin/phpmyadmin/commit/735db02112d90b43c84b4d419a2346c183dc0472
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M ChangeLog
    M libraries/classes/Types.php

  Log Message:
  -----------
  Support JSON datatype on MariaDB 10.2.7 and newer

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bd7ff2fe68a8...735db02112d9