Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3e9c30a5617b76ced1d25c7c046cb419ff504f37 https://github.com/phpmyadmin/phpmyadmin/commit/3e9c30a5617b76ced1d25c7c046c... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-28 (Fri, 28 Oct 2016) Changed paths: M doc/faq.rst Log Message: ----------- Document prevention of errors with import of ROW_FORMAT=fixed in newer MySQL versions See https://github.com/phpmyadmin/phpmyadmin/issues/12195#issuecomment-256849353 Fix #12195 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 2fbf09ba2d7b8e75744b4cac2a7325bc68da126a https://github.com/phpmyadmin/phpmyadmin/commit/2fbf09ba2d7b8e75744b4cac2a73... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-28 (Fri, 28 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #12195 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: d73bf36ff728f6eb4eb7c72fa4c4b2ca48f5a5ef https://github.com/phpmyadmin/phpmyadmin/commit/d73bf36ff728f6eb4eb7c72fa4c4... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-28 (Fri, 28 Oct 2016) Changed paths: M ChangeLog M doc/faq.rst Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/24aee3758d89...d73bf36ff728