Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 06e8b65738560f52766dd9087a2c9dec9f5be45e https://github.com/phpmyadmin/phpmyadmin/commit/06e8b65738560f52766dd9087a2c... Author: cmyker cmyk777@gmail.com Date: 2014-09-02 (Tue, 02 Sep 2014)

Changed paths: M libraries/replication.inc.php M libraries/replication_gui.lib.php

Log Message: ----------- Support of MariaDB 10+ multi-master replication functionality See https://mariadb.com/kb/en/mariadb/documentation/replication-cluster-multi-ma...

Signed-off-by: Igor Prokopenkov cmyk777@gmail.com

Commit: f2e6c24370e78c5f536d4c4d7646b521add55b72 https://github.com/phpmyadmin/phpmyadmin/commit/f2e6c24370e78c5f536d4c4d7646... Author: Marc Delisle marc@infomarc.info Date: 2014-09-02 (Tue, 02 Sep 2014)

Changed paths: M libraries/replication.inc.php M libraries/replication_gui.lib.php

Log Message: ----------- Merge pull request #1350 from cmyker/master

Support of MariaDB 10+ multi-master replication functionality See https:...

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4faa0d1ebdf0...f2e6c24370e7