Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ec08844246b19263feecd01b21b2aa61dac73701 https://github.com/phpmyadmin/phpmyadmin/commit/ec08844246b19263feecd01b21b2... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-10 (Thu, 10 Nov 2016)

Changed paths: M browse_foreigners.php M libraries/relation.lib.php

Log Message: ----------- Use a forcing parameter to get $the_total records for a foreign key column

Required at some specific places for ex. browse_foreigners.php (reqd for pagination) This is in continuation of original fix for #12257 (in #12685)

Also fixed an error in an old commit 9880f573441fcac53e61ee17eeaf690c1e06ecb0 related to LIMIT clause generation

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 0bdb13e960d03b10506a594e452088f3566175b3 https://github.com/phpmyadmin/phpmyadmin/commit/0bdb13e960d03b10506a594e4520... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-10 (Thu, 10 Nov 2016)

Changed paths: M browse_foreigners.php M libraries/relation.lib.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5dc004dfe064...0bdb13e960d0