diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 063620f4a98..c5e23a670bb 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -206,6 +206,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Release http.server metricset as GA. {pull}10240[10240]
 - Release Nats module as GA. {pull}10281[10281]
 - Release use of xpack.enabled: true flag in Elasticsearch and Kibana modules as GA. {pull}10222[10222]
+- Add support for MySQL 8.0 and tests also for Percona and MariaDB. {pull}10261[10261]
 
 *Packetbeat*
 
diff --git a/metricbeat/docs/modules/mysql.asciidoc b/metricbeat/docs/modules/mysql.asciidoc
index 5a7f0e6d801..5952b24b4b5 100644
--- a/metricbeat/docs/modules/mysql.asciidoc
+++ b/metricbeat/docs/modules/mysql.asciidoc
@@ -35,8 +35,9 @@ precedence over those specified in the `username` and `password` config options.
 [float]
 === Compatibility
 
-The mysql MetricSets were tested with mysql 5.7.12 and are expected to work with
-all versions >= 5.7.0.
+The mysql MetricSets were tested with MySQL and Percona 5.7 and 8.0 and are expected
+to work with all versions >= 5.7.0.
+It is also tested with MariaDB 10.2 and 10.3.
 
 [float]
 === Dashboard
diff --git a/metricbeat/module/mysql/_meta/docs.asciidoc b/metricbeat/module/mysql/_meta/docs.asciidoc
index 95dc69a19dc..22dcae34c4e 100644
--- a/metricbeat/module/mysql/_meta/docs.asciidoc
+++ b/metricbeat/module/mysql/_meta/docs.asciidoc
@@ -28,8 +28,9 @@ precedence over those specified in the `username` and `password` config options.
 [float]
 === Compatibility
 
-The mysql MetricSets were tested with mysql 5.7.12 and are expected to work with
-all versions >= 5.7.0.
+The mysql MetricSets were tested with MySQL and Percona 5.7 and 8.0 and are expected
+to work with all versions >= 5.7.0.
+It is also tested with MariaDB 10.2 and 10.3.
 
 [float]
 === Dashboard