Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f7f03127f7486281ccd4335f8137bec19ebb7254 https://github.com/phpmyadmin/phpmyadmin/commit/f7f03127f7486281ccd4335f8137... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/tbl_info.inc.php M tbl_operations.php Log Message: ----------- Store create options in serapate array instead of polluting global namespace This is just a minor cleanup to avoid possible problems when MySQL create table options would collide with our variable names. See also issue #12567 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ad87644941f3967dce3d0e052611fb0aaf3442e4 https://github.com/phpmyadmin/phpmyadmin/commit/ad87644941f3967dce3d0e052611... Author: Michal Čihař <michal@cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/tbl_info.inc.php M tbl_operations.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7fc28626fdbc...ad87644941f3