Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4e668051eeb9f6d5a377d4f0e0a7c938f6727d14 https://github.com/phpmyadmin/phpmyadmin/commit/4e668051eeb9f6d5a377d4f0e0a7... Author: Dan Ungureanu udan1107@gmail.com Date: 2015-10-02 (Fri, 02 Oct 2015)

Changed paths: M libraries/sql-parser/src/Components/OptionsArray.php

Log Message: ----------- Fix #11531. Invalid SQL in table definition when exporting table. Cherry-picked udan11/sql-parser@e5b1cd830d2156127ba090d0d173e344db5fcfd1.

Signed-off-by: Dan Ungureanu udan1107@gmail.com

Commit: f49f049636b3cb4a0550985b0a00a992a83ad932 https://github.com/phpmyadmin/phpmyadmin/commit/f49f049636b3cb4a0550985b0a00... Author: Marc Delisle marc@infomarc.info Date: 2015-10-02 (Fri, 02 Oct 2015)

Changed paths: M libraries/sql-parser/src/Components/OptionsArray.php

Log Message: ----------- Merge pull request #11532 from udan11/QA_4_5

Fix #11531.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/41a59578c193...f49f049636b3