Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eac19b87adb1c192a33ddc1f28fed3c218799a21 https://github.com/phpmyadmin/phpmyadmin/commit/eac19b87adb1c192a33ddc1f28fe... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php
Log Message: ----------- bug #4966 MySQL errors are not shown when DebugSQL is enabled
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 5a1ebc2b4a1f45e647279128c6c2179495fcd236 https://github.com/phpmyadmin/phpmyadmin/commit/5a1ebc2b4a1f45e647279128c6c2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-22 (Mon, 22 Jun 2015)
Changed paths: M doc/config.rst M libraries/Config.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/sql.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/fy.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po A templates/startAndNumberOfRowsPanel.phtml M test/classes/PMA_Config_test.php M test/classes/PMA_Util_test.php
Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/52ea1026adf6...5a1ebc2b4a1f