[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f4541c: Fix #12132 Can not open table with JSON field

[Isaac Bennetch]

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

  Changed paths:
    M ChangeLog
    M libraries/dbi/DBIMysqli.php

  Log Message:
  -----------
  Fix #12132 Can not open table with JSON field

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 3c139e5899a91dd44526761161b8c6f6c8d529bb
      https://github.com/phpmyadmin/phpmyadmin/commit/3c139e5899a91dd44526761161b8c6f6c8d529bb
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/dbi/DBIMysqli.php

  Log Message:
  -----------
  Merge pull request #12141 from madhuracj/issue12132

Fix #12132 Can not open table with JSON field


  Commit: cb91d94705c36e90530835d725a58d1ba565ed6d
      https://github.com/phpmyadmin/phpmyadmin/commit/cb91d94705c36e90530835d725a58d1ba565ed6d
  Author: Ricardo Crivelli <ricardocrivelli at gmail.com>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 92.3% (2964 of 3211 strings)

[CI skip]


  Commit: a1dd261603cf6f510098bb0b75a22aba54dbdf0c
      https://github.com/phpmyadmin/phpmyadmin/commit/a1dd261603cf6f510098bb0b75a22aba54dbdf0c
  Author: Weblate <noreply at weblate.org>
  Date:   2016-03-29 (Tue, 29 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/dbi/DBIMysqli.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


  Commit: 18670840c8785ef4d9f75d91606f9b0f75514d56
      https://github.com/phpmyadmin/phpmyadmin/commit/18670840c8785ef4d9f75d91606f9b0f75514d56
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-03-30 (Wed, 30 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/dbi/DBIMysqli.php
    M po/pt_BR.po

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

Fix merge conflicts in po/pt_BR.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d2125684fe5e...18670840c878