[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e52a71: Fix error in query builder

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e52a71592a68514d06c8c601d1a9feda6c426145
      https://github.com/phpmyadmin/phpmyadmin/commit/e52a71592a68514d06c8c601d1a9feda6c426145
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-05-16 (Tue, 16 May 2017)

  Changed paths:
    M ChangeLog
    M libraries/DbQbe.php

  Log Message:
  -----------
  Fix error in query builder

Fixes #13274

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 26e39f9d826b864a9e2748509972c6ba8bac8739
      https://github.com/phpmyadmin/phpmyadmin/commit/26e39f9d826b864a9e2748509972c6ba8bac8739
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-05-16 (Tue, 16 May 2017)

  Changed paths:
    M ChangeLog
    M libraries/DbQbe.php

  Log Message:
  -----------
  Merge branch 'QA_4_7'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6479c830c4d4...26e39f9d826b