Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b21c43245d0d3bcf6adbea87e5a85bce1b63dc6f https://github.com/phpmyadmin/phpmyadmin/commit/b21c43245d0d3bcf6adbea87e5a8... Author: Smita Kumari kumarismita62@gmail.com Date: 2014-04-09 (Wed, 09 Apr 2014)

Changed paths: M export.php M js/export.js M libraries/display_export.lib.php

Log Message: ----------- bugfix 4346: if exeTimeLimit is set to zero then export timeout won't occur so need to check for it

Signed-off-by: Smita Kumari kumarismita62@gmail.com

Commit: cf5452afbc110da41021bceaaba6615a159fc220 https://github.com/phpmyadmin/phpmyadmin/commit/cf5452afbc110da41021bceaaba6... Author: Marc Delisle marc@infomarc.info Date: 2014-04-10 (Thu, 10 Apr 2014)

Changed paths: M export.php M js/export.js M libraries/display_export.lib.php

Log Message: ----------- Merge pull request #1131 from smita786/QA_4_1

bugfix 4346: if execTimeLimit is set to zero then export timeout won't

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e1de0e9628e6...cf5452afbc11