[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 7a7664: Bookmark id that is an auto_increment column can o...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7a766402794d43e8a8e2220939f24a3b1f7e690f
      https://github.com/phpmyadmin/phpmyadmin/commit/7a766402794d43e8a8e2220939f24a3b1f7e690f
  Author: Daniel Popiniuc <danielpopiniuc at gmail.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M sql/create_tables.sql
    A sql/upgrade_column_info_4_6_5+.sql

  Log Message:
  -----------
  Bookmark id that is an auto_increment column can only take positive values starting from 1, therefore should be unsigned otherwise half of allowed interval is wasted from start, and this is the fix for that.


  Commit: 2309ef57d2065277339513590b24b02d4115cc39
      https://github.com/phpmyadmin/phpmyadmin/commit/2309ef57d2065277339513590b24b02d4115cc39
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M js/pmd/history.js
    M libraries/pmd_common.php

  Log Message:
  -----------
  Add LEFT JOIN for different constraints

If there are two or more columns in the same constraint (foreign key),
we should use AND to concatenate the conditions on LEFT JOIN for both the columns

Fix #12652

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: 2c90167a8aef20fcf36765fbcef42a612fc8f2e5
      https://github.com/phpmyadmin/phpmyadmin/commit/2c90167a8aef20fcf36765fbcef42a612fc8f2e5
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M js/pmd/history.js
    M libraries/pmd_common.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/pull/12689' into QA_4_6


  Commit: 3debbdd09b3b176bfb1686252ffc221de98e1eb4
      https://github.com/phpmyadmin/phpmyadmin/commit/3debbdd09b3b176bfb1686252ffc221de98e1eb4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog entry for 12689

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


  Commit: 7270a0c79547c9d6800373aa0aa6c4dbb54342d5
      https://github.com/phpmyadmin/phpmyadmin/commit/7270a0c79547c9d6800373aa0aa6c4dbb54342d5
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M libraries/rte/rte_words.lib.php

  Log Message:
  -----------
  Add missing punctionation

See PR #12686

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


  Commit: 0b62043c7e86b56349927bf410907d4e9f968d78
      https://github.com/phpmyadmin/phpmyadmin/commit/0b62043c7e86b56349927bf410907d4e9f968d78
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M ChangeLog
    M js/pmd/history.js
    M libraries/pmd_common.php
    M libraries/rte/rte_words.lib.php

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


  Commit: 3b48533288c1558d9f08cdfefdb6719cffc23412
      https://github.com/phpmyadmin/phpmyadmin/commit/3b48533288c1558d9f08cdfefdb6719cffc23412
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M sql/create_tables.sql
    A sql/upgrade_column_info_4_6_5+.sql

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/pull/12688'


  Commit: 9c52cd4c6654e4178070215095f8c7a08aea2961
      https://github.com/phpmyadmin/phpmyadmin/commit/9c52cd4c6654e4178070215095f8c7a08aea2961
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    R sql/upgrade_column_info_4_6_5+.sql
    A sql/upgrade_tables_4_7_0+.sql

  Log Message:
  -----------
  Correctly name upgrade file (pr #12688)

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


  Commit: 76eaef75842577d743782e643d5d393323df8620
      https://github.com/phpmyadmin/phpmyadmin/commit/76eaef75842577d743782e643d5d393323df8620
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog entry for #12688

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


  Commit: 19db0d1cef1ef74ca466a3008b4d3a28d125642e
      https://github.com/phpmyadmin/phpmyadmin/commit/19db0d1cef1ef74ca466a3008b4d3a28d125642e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-11-09 (Wed, 09 Nov 2016)

  Changed paths:
    M doc/setup.rst

  Log Message:
  -----------
  Document upgrading for #12688

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c2da1a803fa6...19db0d1cef1e