Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ed8ba7b3d76aee3e1b611ad10ce93769ebbb0aaa https://github.com/phpmyadmin/phpmyadmin/commit/ed8ba7b3d76aee3e1b611ad10ce9... Author: Marc Delisle marc@infomarc.info Date: 2015-10-05 (Mon, 05 Oct 2015)

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

Log Message: ----------- Fixes #11541 Missing arguments for PMA_Table::generateAlter()

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: be17cf15cb8acad875a0aaf02536e8ea4b408dbf https://github.com/phpmyadmin/phpmyadmin/commit/be17cf15cb8acad875a0aaf02536... Author: Marc Delisle marc@infomarc.info Date: 2015-10-05 (Mon, 05 Oct 2015)

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

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad7d40c59e0d...be17cf15cb8a