Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4465c287c1e0228bd23ddbc49777111433e2d147 https://github.com/phpmyadmin/phpmyadmin/commit/4465c287c1e0228bd23ddbc49777... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-26 (Thu, 26 Jul 2012)

Changed paths: M import.php M libraries/DisplayResults.class.php M libraries/Table.class.php M libraries/relation.lib.php M sql.php

Log Message: ----------- Fixed an issue related to multiquery statements and routines modifications

Commit: b458ba2b184791e14fbcdbf3cb7b70dd930ca400 https://github.com/phpmyadmin/phpmyadmin/commit/b458ba2b184791e14fbcdbf3cb7b... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-26 (Thu, 26 Jul 2012)

Changed paths: M db_operations.php M export.php M libraries/CommonFunctions.class.php M libraries/config.default.php M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportExcel.class.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportMediawiki.class.php M libraries/plugins/export/ExportOds.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportPdf.class.php M libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/export/ExportYaml.class.php A libraries/properties/PropertyItem.class.php A libraries/properties/options/OptionsPropertyGroup.class.php A libraries/properties/options/OptionsPropertyItem.class.php A libraries/properties/options/OptionsPropertyOneItem.class.php A libraries/properties/options/groups/OptionsPropertyMainGroup.class.php A libraries/properties/options/groups/OptionsPropertyRootGroup.class.php A libraries/properties/options/groups/OptionsPropertySubgroup.class.php A libraries/properties/options/items/BoolPropertyItem.class.php A libraries/properties/options/items/DocPropertyItem.class.php A libraries/properties/options/items/HiddenPropertyItem.class.php A libraries/properties/options/items/MessageOnlyPropertyItem.class.php A libraries/properties/options/items/RadioPropertyItem.class.php A libraries/properties/options/items/SelectPropertyItem.class.php A libraries/properties/options/items/TextPropertyItem.class.php A libraries/properties/plugins/ExportPluginProperties.class.php A libraries/properties/plugins/ImportPluginProperties.class.php A libraries/properties/plugins/PluginPropertyItem.class.php A libraries/properties/plugins/TransformationsPluginProperties.class.php M po/ca.po M po/gl.po M po/ko.po M po/sk.po M po/tr.po M po/zh_CN.po M test/AllSeleniumTests.php M test/classes/PMA_Types_MySQL_test.php M test/libraries/PMA_bookmark_test.php A test/selenium/PmaSeleniumCreateDropDatabaseTest.php

Log Message: ----------- Merge remote branch 'upstream/master'

Commit: 85d91e453a3759f28dae7476e8a1a66b1b7783fb https://github.com/phpmyadmin/phpmyadmin/commit/85d91e453a3759f28dae7476e8a1... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-26 (Thu, 26 Jul 2012)

Changed paths: M libraries/rte/rte_routines.lib.php

Log Message: ----------- Improve success message displaying in routines

Commit: 3a1e5d20d5a9be4f7b36ccf696f587010e765bd9 https://github.com/phpmyadmin/phpmyadmin/commit/3a1e5d20d5a9be4f7b36ccf696f5... Author: Michal Čihař michal@cihar.com Date: 2012-07-26 (Thu, 26 Jul 2012)

Changed paths: M import.php M libraries/DisplayResults.class.php M libraries/Table.class.php M libraries/relation.lib.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/d07e580dd76b...3a1e5d20d5a9