Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fe4a3e8727164ceded739387c16f49bd2987431c https://github.com/phpmyadmin/phpmyadmin/commit/fe4a3e8727164ceded739387c16f... Author: Michal Čihař michal@cihar.com Date: 2016-03-02 (Wed, 02 Mar 2016)

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

Log Message: ----------- Fixed processing of queries with escaped quotes

Imported SQL parser d2e37de1dbec251556f35712bddcd61d24baaee6

Fixes #12054

Signed-off-by: Michal Čihař michal@cihar.com

Commit: baaedf0b74ec37c3952de840e7147dcac875375c https://github.com/phpmyadmin/phpmyadmin/commit/baaedf0b74ec37c3952de840e714... Author: Michal Čihař michal@cihar.com Date: 2016-03-02 (Wed, 02 Mar 2016)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dd5662977b42...baaedf0b74ec