Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d5acfed0e8dd0932bdbf46404ddd9daf7d7f9c74 https://github.com/phpmyadmin/phpmyadmin/commit/d5acfed0e8dd0932bdbf46404ddd... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths: M import.php M libraries/database_interface.lib.php M libraries/dbi/mysqli.dbi.lib.php M libraries/import.lib.php M libraries/plugins/import/ImportSql.class.php M sql.php
Log Message: ----------- Multiple results support for SQL executions
Commit: e1cda739960f4758437c7f99b40f68d04f0463b5 https://github.com/phpmyadmin/phpmyadmin/commit/e1cda739960f4758437c7f99b40f... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths: M ChangeLog M build.xml M libraries/Advisor.class.php M libraries/CommonFunctions.class.php M libraries/advisory_rules.txt M libraries/bookmark.lib.php M libraries/rte/rte_events.lib.php A phpunit.xml.nocoverage 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/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/ko.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/nl.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/zh_CN.po M po/zh_TW.po M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Error_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_Message_test.php M test/classes/PMA_PDF_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_StorageEngine_test.php M test/classes/PMA_Theme_Manager_test.php M test/classes/PMA_Types_MySQL_test.php M test/classes/gis/PMA_GIS_Geometrycollection_test.php M test/libraries/PMA_SQL_parser_test.php M test/libraries/PMA_STR_sub_test.php M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/common/PMA_expandUserString_test.php A test/libraries/core/PMA_headerLocation_test.php R test/libraries/core/PMA_headerLocation_test_disabled.php M test/libraries/core/PMA_warnMissingExtension_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge remote branch 'upstream/master'
Commit: 9f1f8d6c75c4f4332f5e78ffd9fc66747c2ea226 https://github.com/phpmyadmin/phpmyadmin/commit/9f1f8d6c75c4f4332f5e78ffd9fc... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M libraries/dbi/mysqli.dbi.lib.php M libraries/import.lib.php M sql.php
Log Message: ----------- Support for stored procedures with multiple queries
Commit: 51d9dfb9b6dc49ac7c1646c6db8b0ffb4b1cac23 https://github.com/phpmyadmin/phpmyadmin/commit/51d9dfb9b6dc49ac7c1646c6db8b... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M libraries/PDF.class.php M libraries/schema/User_Schema.class.php A libraries/server_privileges.lib.php M server_privileges.php
Log Message: ----------- Merge remote branch 'upstream/master'
Commit: 42bff42aca96f32e6bbe68653944f92199cc1a2c https://github.com/phpmyadmin/phpmyadmin/commit/42bff42aca96f32e6bbe68653944... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M libraries/import.lib.php M sql.php
Log Message: ----------- Support for swap among databases in multiple queries
Commit: bd01c902bc252294e0c30cf2e9c92b3cc205602e https://github.com/phpmyadmin/phpmyadmin/commit/bd01c902bc252294e0c30cf2e9c9... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/schema/Visio_Relation_Schema.class.php
Log Message: ----------- Merge remote branch 'upstream/master'
Commit: 0659000a4e773ef8ae2f46f800bfdbce285deb6a https://github.com/phpmyadmin/phpmyadmin/commit/0659000a4e773ef8ae2f46f800bf... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M libraries/rte/rte_routines.lib.php
Log Message: ----------- Support for routines execute under Routines tab
Commit: adcae901e18c626b4a649d8f93b3e0966d19d6ee https://github.com/phpmyadmin/phpmyadmin/commit/adcae901e18c626b4a649d8f93b3... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M libraries/DisplayResults.class.php M sql.php
Log Message: ----------- Put some limitations for multiple results display mode
Commit: 63c1cef6cacbd650502dcf62003bb366bfe253b3 https://github.com/phpmyadmin/phpmyadmin/commit/63c1cef6cacbd650502dcf62003b... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths: M po/da.po M po/fa.po M po/zh_CN.po M test/classes/PMA_Error_Handler_test.php M test/classes/PMA_List_Database_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_StorageEngine_test.php
Log Message: ----------- Merge remote branch 'upstream/master'
Commit: b81935e05c23cd7c86d86ca76141589b19f16ef4 https://github.com/phpmyadmin/phpmyadmin/commit/b81935e05c23cd7c86d86ca76141... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths: M libraries/database_interface.lib.php M libraries/dbi/mysql.dbi.lib.php M libraries/dbi/mysqli.dbi.lib.php
Log Message: ----------- Use PMA_DBI_real_multi_query function, inside PMA_DBI_try_multi_query function
Commit: 4c5d5f6626bc8cb7fc39740473d6df0b2346796f https://github.com/phpmyadmin/phpmyadmin/commit/4c5d5f6626bc8cb7fc39740473d6... Author: Michal Čihař michal@cihar.com Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths: M import.php M libraries/DisplayResults.class.php M libraries/database_interface.lib.php M libraries/dbi/mysql.dbi.lib.php M libraries/dbi/mysqli.dbi.lib.php M libraries/import.lib.php M libraries/plugins/import/ImportSql.class.php M libraries/rte/rte_routines.lib.php M sql.php
Log Message: ----------- Merge remote-tracking branch 'chanaka/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b1ae4629ac11...4c5d5f6626bc