Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2309ef57d2065277339513590b24b02d4115cc39
https://github.com/phpmyadmin/phpmyadmin/commit/2309ef57d2065277339513590b24b02d4115cc39
Author: Deven Bansod <[email protected]>
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 <[email protected]>
Commit: 2c90167a8aef20fcf36765fbcef42a612fc8f2e5
https://github.com/phpmyadmin/phpmyadmin/commit/2c90167a8aef20fcf36765fbcef42a612fc8f2e5
Author: Michal Čihař <[email protected]>
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ř <[email protected]>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Changelog entry for 12689
Signed-off-by: Michal Čihař <[email protected]>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/0404f09acead...3debbdd09b3b_______________________________________________
Git mailing list
[email protected]
https://lists.phpmyadmin.net/mailman/listinfo/git
