[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6f8027: Fix #11542. Import parser broken in 4.5.x.x.

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6f802746d6887e3ea3dc30513a5f80ec27d9e7dd https://github.com/phpmyadmin/phpmyadmin/commit/6f802746d6887e3ea3dc30513a5… Author: Dan Ungureanu <udan1107(a)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(a)gmail.com> Commit: efe0416565e665125bc3fc387bb07cbbaeb80ebd https://github.com/phpmyadmin/phpmyadmin/commit/efe0416565e665125bc3fc387bb… Author: Marc Delisle <marc(a)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. Commit: 1fb6395e613bbaaab5199cf0f6f4ef25853335ed https://github.com/phpmyadmin/phpmyadmin/commit/1fb6395e613bbaaab5199cf0f6f… Author: disorderman <disorderman(a)qq.com> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Chinese (China)) Currently translated at 84.4% (2711 of 3209 strings) [CI skip] Commit: ca85cd134a108e470111cb86feea815e96da6a36 https://github.com/phpmyadmin/phpmyadmin/commit/ca85cd134a108e470111cb86fee… Author: Weblate <noreply(a)weblate.org> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M libraries/sql-parser/src/Utils/BufferedQuery.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: ee958f08cba82e0c83da705b41db99cd941c12bd https://github.com/phpmyadmin/phpmyadmin/commit/ee958f08cba82e0c83da705b41d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 8668a92716a8b5cbd66d1a5f5d5fac33cf5f5cae https://github.com/phpmyadmin/phpmyadmin/commit/8668a92716a8b5cbd66d1a5f5d5… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M libraries/sql-parser/src/Utils/BufferedQuery.php Log Message: ----------- Merge commit 'efe0416' Commit: 8b615feb1aa3ca8293ed6b1be59e850af0716ef0 https://github.com/phpmyadmin/phpmyadmin/commit/8b615feb1aa3ca8293ed6b1be59… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-06 (Tue, 06 Oct 2015) Log Message: ----------- Merge commit 'ca85cd1' Commit: 621825fadd246f122a312136f2ab6d8e8dee7603 https://github.com/phpmyadmin/phpmyadmin/commit/621825fadd246f122a312136f2a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-10-06 (Tue, 06 Oct 2015) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/911217e6b4ad...621825fadd24