[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ac8036: bug fix 4286

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ac80367c8c2626e470963b1ad88b06858815e3b1
      https://github.com/phpmyadmin/phpmyadmin/commit/ac80367c8c2626e470963b1ad88b06858815e3b1
  Author: Sampath Liyanage <plbsam at gmail.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  bug fix 4286

Signed-off-by: Sampath Liyanage <plbsam at gmail.com>


  Commit: 60da3dbc565f5ff87986956dc5fdf530424c90f6
      https://github.com/phpmyadmin/phpmyadmin/commit/60da3dbc565f5ff87986956dc5fdf530424c90f6
  Author: Yuki Shira <shirayuking at gmail.com>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M po/ja.po

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

Currently translated at 89.6% (2465 of 2749)


  Commit: 0299624abeef2fd287a30484064291f070d94891
      https://github.com/phpmyadmin/phpmyadmin/commit/0299624abeef2fd287a30484064291f070d94891
  Author: Huang Zhiyi <hzy980512 at 126.com>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M po/zh_CN.po

  Log Message:
  -----------
  Translated using Weblate (Simplified Chinese)

Currently translated at 95.7% (2633 of 2749)


  Commit: cbc9b2a11bd5c837338e4a2de1982e34841861ff
      https://github.com/phpmyadmin/phpmyadmin/commit/cbc9b2a11bd5c837338e4a2de1982e34841861ff
  Author: Weblate <noreply at weblate.org>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

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

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


  Commit: adf5f378f3c43820c69c854cbc44b9e56afb4834
      https://github.com/phpmyadmin/phpmyadmin/commit/adf5f378f3c43820c69c854cbc44b9e56afb4834
  Author: Yuki Shira <shirayuking at gmail.com>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M po/ja.po

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

Currently translated at 89.6% (2465 of 2749)


  Commit: eceef4155cb2ff3b118ef6dc7f4d473723674815
      https://github.com/phpmyadmin/phpmyadmin/commit/eceef4155cb2ff3b118ef6dc7f4d473723674815
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-16 (Sun, 16 Feb 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for fix of bug #4286

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


  Commit: 8d3e6df81658216641ea5e7f9983d1225e13b692
      https://github.com/phpmyadmin/phpmyadmin/commit/8d3e6df81658216641ea5e7f9983d1225e13b692
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-16 (Sun, 16 Feb 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge pull request #934 from sampathLiyanage/bugfix4286

bug fix 4286


  Commit: 1029776df19ec676cd88d9765312b19f3c64a72b
      https://github.com/phpmyadmin/phpmyadmin/commit/1029776df19ec676cd88d9765312b19f3c64a72b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-16 (Sun, 16 Feb 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge commit 'ac80367'


  Commit: 273909b56be6e925925c6ee91e7a498a710cac4d
      https://github.com/phpmyadmin/phpmyadmin/commit/273909b56be6e925925c6ee91e7a498a710cac4d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-16 (Sun, 16 Feb 2014)

  Log Message:
  -----------
  Merge commit '8d3e6df'


  Commit: b79abc4f180d32ac4f6ce7e938510d7b75682560
      https://github.com/phpmyadmin/phpmyadmin/commit/b79abc4f180d32ac4f6ce7e938510d7b75682560
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-02-16 (Sun, 16 Feb 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_1'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1ef691f7d744...b79abc4f180d