[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b0297c: Unset foreign_key_checks while testing insert priv...

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b0297c5dccbe3dc52922acef36fc98cbe84fa2c6 https://github.com/phpmyadmin/phpmyadmin/commit/b0297c5dccbe3dc52922acef36f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-18 (Fri, 18 Dec 2015) Changed paths: M libraries/check_user_privileges.lib.php Log Message: ----------- Unset foreign_key_checks while testing insert priv and reset it back Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5db813b7a4664acdf0b5c4495304dc4b9161a9fe https://github.com/phpmyadmin/phpmyadmin/commit/5db813b7a4664acdf0b5c449530… Author: Deven Bansod <devenbansod(a)users.noreply.github.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/check_user_privileges.lib.php Log Message: ----------- Merge pull request #11761 from devenbansod/fix_11752 Fix #11752 : PMA 4.5.2 breaks MySQL Master-Master Cluster Commit: eff2ad168bafc70d031fcaf605ea880e5306fc25 https://github.com/phpmyadmin/phpmyadmin/commit/eff2ad168bafc70d031fcaf605e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for issue #11752 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: f2124ee1e2d324715eebe4a3d331a19963539ea7 https://github.com/phpmyadmin/phpmyadmin/commit/f2124ee1e2d324715eebe4a3d33… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for issue #11757 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 52f326c98b16425a82f670339163dfa33eae8ee7 https://github.com/phpmyadmin/phpmyadmin/commit/52f326c98b16425a82f67033916… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/check_user_privileges.lib.php Log Message: ----------- Merge branch 'QA_4_5' Conflicts: libraries/check_user_privileges.lib.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/996a6b663662...52f326c98b16