[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ddadc4: Merge branch 'D-storm-so' into QA_4_2

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ddadc4853ed2f58f59883965c983dc2d2a6b76f9
      https://github.com/phpmyadmin/phpmyadmin/commit/ddadc4853ed2f58f59883965c983dc2d2a6b76f9
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M ChangeLog
    M libraries/sqlparser.lib.php

  Log Message:
  -----------
  Merge branch 'D-storm-so' into QA_4_2

bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog


  Commit: a7703a36441f764f7cdadc0a1b9ee74b477df546
      https://github.com/phpmyadmin/phpmyadmin/commit/a7703a36441f764f7cdadc0a1b9ee74b477df546
  Author: Panagiotis Papazoglou <papaz_p at yahoo.com>
  Date:   2014-06-14 (Sat, 14 Jun 2014)

  Changed paths:
    M po/el.po

  Log Message:
  -----------
  Translated using Weblate (Greek)

Currently translated at 100.0% (2770 of 2770)


  Commit: 47709d414ef88a5ff63c0069c23e9d8b427bb68e
      https://github.com/phpmyadmin/phpmyadmin/commit/47709d414ef88a5ff63c0069c23e9d8b427bb68e
  Author: Christian Simon <simon at swine.de>
  Date:   2014-06-14 (Sat, 14 Jun 2014)

  Changed paths:
    M js/error_report.js
    M js/server_privileges.js

  Log Message:
  -----------
  Fix 'token mismatch' due to missing server parameter for some AJAX requests

* server_privileges user duplicate request
* js error_reporting
* cf. https://sourceforge.net/p/phpmyadmin/bugs/3893

Signed-off-by: Christian Simon <simon at swine.de>
Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: a33fcad037f58ddddb9714f186f12b49753062be
      https://github.com/phpmyadmin/phpmyadmin/commit/a33fcad037f58ddddb9714f186f12b49753062be
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-14 (Sat, 14 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: d387040b367505274bcbcba70b24da6b331ef570
      https://github.com/phpmyadmin/phpmyadmin/commit/d387040b367505274bcbcba70b24da6b331ef570
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-14 (Sat, 14 Jun 2014)

  Log Message:
  -----------
  Merge commit 'a7703a3'


  Commit: dcb4163369c79ff1bbd875dacb83a107079b0d79
      https://github.com/phpmyadmin/phpmyadmin/commit/dcb4163369c79ff1bbd875dacb83a107079b0d79
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-14 (Sat, 14 Jun 2014)

  Changed paths:
    M ChangeLog
    M js/error_report.js
    M js/server_privileges.js

  Log Message:
  -----------
  Merge commit 'a33fcad'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/36864a1213b4...dcb4163369c7