Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: fe3941b9bda2ea60a1966bf2bc0c8867f6c25aa7
https://github.com/phpmyadmin/phpmyadmin/commit/fe3941b9bda2ea60a1966bf2bc0c8867f6c25aa7
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-11-08 (Sat, 08 Nov 2014)
Changed paths:
M ChangeLog
M libraries/plugins/import/ImportSql.class.php
Log Message:
-----------
Fix #4495 Comment lines in multiquery
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: 58c629f6fd6f9b58aba384ba4f9f970e1dba7b88
https://github.com/phpmyadmin/phpmyadmin/commit/58c629f6fd6f9b58aba384ba4f9f970e1dba7b88
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-11-10 (Mon, 10 Nov 2014)
Changed paths:
M ChangeLog
M db_create.php
M db_structure.php
M js/ajax.js
M js/navigation.js
M libraries/Footer.class.php
M libraries/Menu.class.php
M libraries/Response.class.php
M libraries/ServerStatusData.class.php
M libraries/StorageEngine.class.php
M libraries/Util.class.php
M libraries/import.lib.php
M libraries/navigation/Nodes/Node.class.php
M libraries/plugins/import/ImportSql.class.php
M libraries/replication.inc.php
M libraries/server_databases.lib.php
M libraries/server_status.lib.php
M libraries/structure.lib.php
M libraries/tracking.lib.php
M server_databases.php
M server_replication.php
M server_status.php
M server_status_advisor.php
M server_status_monitor.php
M server_status_processes.php
M server_status_queries.php
M server_status_variables.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_List_Database_test.php
M test/classes/PMA_ServerStatusData_test.php
M test/libraries/PMA_server_databases_test.php
M test/libraries/PMA_server_engines_test.php
M test/libraries/PMA_server_status_advisor_test.php
M test/libraries/PMA_server_status_monitor_test.php
M test/libraries/PMA_server_status_processes_test.php
M test/libraries/PMA_server_status_queries_test.php
M test/libraries/PMA_server_status_test.php
M test/libraries/PMA_server_status_variables_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'master' into b4495_master
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Conflicts:
ChangeLog
Commit: f74ed544f68bc56866503f46ea2b777076b096aa
https://github.com/phpmyadmin/phpmyadmin/commit/f74ed544f68bc56866503f46ea2b777076b096aa
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-11-10 (Mon, 10 Nov 2014)
Changed paths:
M libraries/tracking.lib.php
Log Message:
-----------
Remove trailing whitespace.
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: c80ab105390875592e4f26c789b313258ac6ee3b
https://github.com/phpmyadmin/phpmyadmin/commit/c80ab105390875592e4f26c789b313258ac6ee3b
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-11-10 (Mon, 10 Nov 2014)
Changed paths:
M ChangeLog
M libraries/plugins/import/ImportSql.class.php
M libraries/tracking.lib.php
Log Message:
-----------
Merge pull request #1388 from Tithugues/b4495_master
Fix #4495 Comment lines in multiquery
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/8e6d16cf7e11...c80ab1053908------------------------------------------------------------------------------
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
