Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 520872da7437b99ec6d685892eed0cb80417abe5 https://github.com/phpmyadmin/phpmyadmin/commit/520872da7437b99ec6d685892eed... Author: Hugues Peccatte hugues.peccatte@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@gmail.com

Conflicts: ChangeLog

Commit: 6fb15d8a416c179134832c41fdc7d0cbe668c05c https://github.com/phpmyadmin/phpmyadmin/commit/6fb15d8a416c179134832c41fdc7... Author: Hugues Peccatte hugues.peccatte@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@gmail.com

Commit: 137565274698ddfeb63268547fc5fbd331d2ba68 https://github.com/phpmyadmin/phpmyadmin/commit/137565274698ddfeb63268547fc5... Author: Marc Delisle marc@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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad7c5bbbac9c...137565274698