[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 520872: Fix 'phpmyadmin refuses to show tables with enums ...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 520872da7437b99ec6d685892eed0cb80417abe5
      https://github.com/phpmyadmin/phpmyadmin/commit/520872da7437b99ec6d685892eed0cb80417abe5
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

  Log Message:
  -----------
  Fix 'phpmyadmin refuses to show tables with enums containing special data' bug #4380

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>

Conflicts:
	ChangeLog


  Commit: 6fb15d8a416c179134832c41fdc7d0cbe668c05c
      https://github.com/phpmyadmin/phpmyadmin/commit/6fb15d8a416c179134832c41fdc7d0cbe668c05c
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

  Changed paths:
    M libraries/Util.class.php

  Log Message:
  -----------
  Use PMA_String class to substr multi-bytes.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 137565274698ddfeb63268547fc5fbd331d2ba68
      https://github.com/phpmyadmin/phpmyadmin/commit/137565274698ddfeb63268547fc5fbd331d2ba68
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

  Log Message:
  -----------
  Merge pull request #1159 from Tithugues/b4380_42

phpmyadmin refuses to show tables with enums containing special data


  Commit: f880e5591ce4bc76db1260aa50fddfc628875b70
      https://github.com/phpmyadmin/phpmyadmin/commit/f880e5591ce4bc76db1260aa50fddfc628875b70
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Move ChangeLog entry and clarify it

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 58f9d3cbfaf56bfaecbdc4f65b149521396bcffe
      https://github.com/phpmyadmin/phpmyadmin/commit/58f9d3cbfaf56bfaecbdc4f65b149521396bcffe
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

  Log Message:
  -----------
  Merge commit '6fb15d8'


  Commit: ab17c23e213f3b6ed538288bf5f2c34523bfbac0
      https://github.com/phpmyadmin/phpmyadmin/commit/ab17c23e213f3b6ed538288bf5f2c34523bfbac0
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

  Log Message:
  -----------
  Merge commit '1375652'


  Commit: 14d5f77ed6f72abe5460c6851046be918704864e
      https://github.com/phpmyadmin/phpmyadmin/commit/14d5f77ed6f72abe5460c6851046be918704864e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-04-27 (Sun, 27 Apr 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge commit 'f880e55'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4b8a910fbcdb...14d5f77ed6f7