Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a6e9314cf37bce6a4683e13dcac14698de4ff21e https://github.com/phpmyadmin/phpmyadmin/commit/a6e9314cf37bce6a4683e13dcac1... Author: Isaac Bennetch bennetch@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@gmail.com

Commit: f4907d78578289083247a2334bef1ebc2349fd67 https://github.com/phpmyadmin/phpmyadmin/commit/f4907d78578289083247a2334bef... Author: Madhura Jayaratne madhura.cj@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

Commit: 61dbcafa5663e6f7b5ceed8452fafd6e9a0fc5da https://github.com/phpmyadmin/phpmyadmin/commit/61dbcafa5663e6f7b5ceed8452fa... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-28 (Mon, 28 Mar 2016)

Changed paths: M libraries/TypesMySQL.php

Log Message: ----------- JSON data type is not supported in MariaDB

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: d2125684fe5eb5935788a47e737106e32b62bb16 https://github.com/phpmyadmin/phpmyadmin/commit/d2125684fe5eb5935788a47e7371... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-03-28 (Mon, 28 Mar 2016)

Changed paths: M ChangeLog M libraries/TypesMySQL.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/686c5fe97c33...d2125684fe5e