Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6f802746d6887e3ea3dc30513a5f80ec27d9e7dd https://github.com/phpmyadmin/phpmyadmin/commit/6f802746d6887e3ea3dc30513a5f... Author: Dan Ungureanu udan1107@gmail.com Date: 2015-10-06 (Tue, 06 Oct 2015)

Changed paths: M libraries/sql-parser/src/Utils/BufferedQuery.php

Log Message: ----------- Fix #11542. Import parser broken in 4.5.x.x. Cherry-picked udan11/sql-parser@402890bc7b74534f2150bba7dc40562bf436b085.

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

Commit: efe0416565e665125bc3fc387bb07cbbaeb80ebd https://github.com/phpmyadmin/phpmyadmin/commit/efe0416565e665125bc3fc387bb0... Author: Marc Delisle marc@infomarc.info Date: 2015-10-06 (Tue, 06 Oct 2015)

Changed paths: M libraries/sql-parser/src/Utils/BufferedQuery.php

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

Fix #11542. Import parser broken in 4.5.x.x.

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f830b073196a...efe0416565e6