Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 44046a3d9b01262f982488d16baac3a26db96d60
      
https://github.com/phpmyadmin/phpmyadmin/commit/44046a3d9b01262f982488d16baac3a26db96d60
  Author: 初音ミク(Siketyan) <siketyan0...@gmail.com>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M po/ja.po

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

Currently translated at 67.5% (2168 of 3210 strings)

[CI skip]


  Commit: be9236b08828be7ee9bd0f40d6ec1f074b01c706
      
https://github.com/phpmyadmin/phpmyadmin/commit/be9236b08828be7ee9bd0f40d6ec1f074b01c706
  Author: Weblate <nore...@weblate.org>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M ChangeLog
    M view_create.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5


  Commit: 8ad474dda0458c69b6a29f1b2ad1984b22662bce
      
https://github.com/phpmyadmin/phpmyadmin/commit/8ad474dda0458c69b6a29f1b2ad1984b22662bce
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

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

  Log Message:
  -----------
  Do not invoke FLUSH PRIVILEGES when server in --skip-grant-tables

In this case we know the user has all privileges, so there is no need to
check it.

Also FLUSH PRIVILEGES causes --skip-grant-tables to end, making all
previous checks invalid.

Fixes #11828

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 41758d66c43c07b018cf58c34897ba85146b3579
      
https://github.com/phpmyadmin/phpmyadmin/commit/41758d66c43c07b018cf58c34897ba85146b3579
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Log Message:
  -----------
  Merge commit 'be9236b08828be7ee9bd0f40d6ec1f074b01c706'


  Commit: 135e73b87854187df95bbbeb1e4c0f858f1a2a64
      
https://github.com/phpmyadmin/phpmyadmin/commit/135e73b87854187df95bbbeb1e4c0f858f1a2a64
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

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

  Log Message:
  -----------
  Merge branch 'QA_4_5'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/395bbd608929...135e73b87854
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to