Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 402ebadb19c115ac19a0f76d368023f0cf76f7c9 https://github.com/phpmyadmin/phpmyadmin/commit/402ebadb19c115ac19a0f76d3680... Author: Michal Čihař michal@cihar.com Date: 2017-08-16 (Wed, 16 Aug 2017)

Changed paths: M ChangeLog M libraries/controllers/table/TableStructureController.php

Log Message: ----------- Improved error handling on corrupted tables

Better handle situation where MySQL is unable to give us description of a column. This usually happens when the table is corrupted in some way, but still we should be able to recover from the error and not to fail with dozen of undefined variables.

Fixes #13553

Signed-off-by: Michal Čihař michal@cihar.com

Commit: b146b9195c5fb73848ac056c25da3350214933af https://github.com/phpmyadmin/phpmyadmin/commit/b146b9195c5fb73848ac056c25da... Author: Michal Čihař michal@cihar.com Date: 2017-08-16 (Wed, 16 Aug 2017)

Changed paths: M ChangeLog M libraries/classes/Controllers/Table/TableStructureController.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/aa98a4b10c56...b146b9195c5f