Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 364b26b0dd783cbcc2b1be2113d2cf8cfbde1931 https://github.com/phpmyadmin/phpmyadmin/commit/364b26b0dd783cbcc2b1be2113d2... Author: Andrea Vallorani andrea.vallorani@gmail.com Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths: M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Bug #4798 Missing column when exporting in sql (2)

Export failure when the comments contains reserved keywords (KEY, CONSTRAINT) To resolve, I removed the SQL comment from the current line before checking the presence of reserved keywords.

Signed-off-by: Andrea Vallorani andrea.vallorani@gmail.com

Commit: 3c49594c5647e519d7f417e6c7c7ba5199220ec2 https://github.com/phpmyadmin/phpmyadmin/commit/3c49594c5647e519d7f417e6c7c7... Author: Marc Delisle marc@infomarc.info Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths: M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Merge pull request #1588 from andreaval/QA_4_3

Bug #4798 Missing column when exporting in sql (2)

Commit: 4b8f3c9e615092ecc71310d1707e1b164ca8c26b https://github.com/phpmyadmin/phpmyadmin/commit/4b8f3c9e615092ecc71310d1707e... Author: Marc Delisle marc@infomarc.info Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry

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

Commit: a278b809a308103c58dc9b93b61b2a65c9b5e52e https://github.com/phpmyadmin/phpmyadmin/commit/a278b809a308103c58dc9b93b61b... Author: Marc Delisle marc@infomarc.info Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Merge branch 'QA_4_3' into QA_4_4

Commit: b84c08f4d41e6c5d298573b1c567cc3d8bbc4e98 https://github.com/phpmyadmin/phpmyadmin/commit/b84c08f4d41e6c5d298573b1c567... Author: Marc Delisle marc@infomarc.info Date: 2015-03-17 (Tue, 17 Mar 2015)

Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/23953011c3c6...b84c08f4d41e