diff --git a/.buildkite/scripts/changesets.sh b/.buildkite/scripts/changesets.sh
index 5c6fd6c7b0d8..7e79d2d31647 100644
--- a/.buildkite/scripts/changesets.sh
+++ b/.buildkite/scripts/changesets.sh
@@ -1,77 +1,66 @@
 #!/usr/bin/env bash
-
 # This script contains helper functions related to what should be run depending on Git changes
 
+set -euo pipefail
+
 OSS_MODULE_PATTERN="^[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*"
 XPACK_MODULE_PATTERN="^x-pack\\/[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*"
 
-are_paths_changed() {
-  local patterns=("${@}")
-  local changelist=()
-  for pattern in "${patterns[@]}"; do
-    changed_files=($(git diff --name-only HEAD@{1} HEAD | grep -E "$pattern"))
-    if [ "${#changed_files[@]}" -gt 0 ]; then
-      changelist+=("${changed_files[@]}")
-    fi
-  done
+definePattern() {
+  pattern="${OSS_MODULE_PATTERN}"
 
-  if [ "${#changelist[@]}" -gt 0 ]; then
-    echo "Files changed:"
-    echo "${changelist[*]}"
-    return 0
-  else
-    echo "No files changed within specified changeset:"
-    echo "${patterns[*]}"
-    return 1
+  if [[ "$beatPath" == *"x-pack/"* ]]; then
+    pattern="${XPACK_MODULE_PATTERN}"
   fi
 }
 
-are_changed_only_paths() {
-  local patterns=("${@}")
-  local changed_files=($(git diff --name-only HEAD@{1} HEAD))
-  local matched_files=()
-  for pattern in "${patterns[@]}"; do
-    local matched=($(grep -E "${pattern}" <<< "${changed_files[@]}"))
-    if [ "${#matched[@]}" -gt 0 ]; then
-      matched_files+=("${matched[@]}")
-    fi
-  done
-  if [ "${#matched_files[@]}" -eq "${#changed_files[@]}" ] || [ "${#changed_files[@]}" -eq 0 ]; then
-    return 0
-  fi
-  return 1
+defineExclusions() {
+  exclude="^$beatPath\/module\/(.*(?<!\.asciidoc|\.png))$"
 }
 
-defineModuleFromTheChangeSet() {
-  # This function sets a `MODULE` env var, required by IT tests, containing a comma separated list of modules for a given beats project (specified via the first argument).
-  # The list is built depending on directories that have changed under `modules/` excluding anything else such as asciidoc and png files.
-  # `MODULE` will empty if no changes apply.
-  local project_path=$1
-  local project_path_transformed=$(echo "$project_path" | sed 's/\//\\\//g')
-  local project_path_exclussion="((?!^${project_path_transformed}\\/).)*\$"
-  local exclude=("^(${project_path_exclussion}|((?!\\/module\\/).)*\$|.*\\.asciidoc|.*\\.png)")
+defineFromCommit() {
+  local changeTarget=${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-$BUILDKITE_BRANCH}
 
-  if [[ "$project_path" == *"x-pack/"* ]]; then
-    local pattern=("$XPACK_MODULE_PATTERN")
+  if [[ -z ${changeTarget+x} ]]; then
+    # If not a PR (no target branch) - use last commit
+    from=$(git rev-parse HEAD^)
   else
-    local pattern=("$OSS_MODULE_PATTERN")
+    # If it's a PR - add "origin/"
+    from="origin/$changeTarget"
   fi
-  local changed_modules=""
-  local module_dirs=$(find "$project_path/module" -mindepth 1 -maxdepth 1 -type d)
-  for module_dir in $module_dirs; do
-    if are_paths_changed $module_dir && ! are_changed_only_paths "${exclude[@]}"; then
-      if [[ -z "$changed_modules" ]]; then
-        changed_modules=$(basename "$module_dir")
-      else
-        changed_modules+=",$(basename "$module_dir")"
-      fi
+}
+
+getMatchingModules() {
+  local changedPaths
+  mapfile -t changedPaths < <(git diff --name-only "$from"..."$BUILDKITE_COMMIT" | grep -P "$exclude" | grep -oP "$pattern")
+  mapfile -t modulesMatched < <(printf "%s\n" "${changedPaths[@]}" | grep -o 'module/.*' | awk -F '/' '{print $2}' | sort -u)
+}
+
+addToModuleEnvVar() {
+  local module
+  for module in "${modulesMatched[@]}"; do
+    if [[ -z ${modules+x} ]]; then
+      modules="$module"
+    else
+      modules+=",$module"
     fi
   done
+}
 
-  # export MODULE="" leads to an infinite loop https://github.com/elastic/ingest-dev/issues/2993
-  if [[ ! -z $changed_modules ]]; then 
-    export MODULE="${changed_modules}"
-    echo "~~~ Set env var MODULE to [$MODULE]"
+defineModuleFromTheChangeSet() {
+  beatPath=$1
+
+  definePattern
+  defineExclusions
+  defineFromCommit
+  getMatchingModules
+
+  if [ "${#modulesMatched[@]}" -gt 0 ]; then
+    addToModuleEnvVar
+    export MODULE=$modules
+    echo "~~~ Detected file changes for some modules. Setting env var MODULE to [$MODULE]"
     echo "~~~ Resuming commands"
+  else
+    echo "~~~ No changes in modules for $beatPath"
   fi
 }
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index b4d890d45443..420f1292d957 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -303,6 +303,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Align on the algorithm used to transform Prometheus histograms into Elasticsearch histograms {pull}36647[36647]
 - Add linux IO metrics to system/process {pull}37213[37213]
 - Add new memory/cgroup metrics to Kibana module {pull}37232[37232]
+- Support schema_name for MySQL performance metricset {pull}38363[38363]
 - Add SSL support to mysql module {pull}37997[37997]
 - Add SSL support for aerospike module {pull}38126[38126]
 - Add last_terminated_timestamp metric in kubernetes module {pull}39200[39200] {issue}3802[3802]
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 708d996f99d8..92af8d33410b 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -53661,6 +53661,15 @@ type: long
 
 --
 
+*`mysql.performance.events_statements.schemaname`*::
++
+--
+Schema name.
+
+type: keyword
+
+--
+
 [float]
 === table_io_waits
 
diff --git a/metricbeat/module/mysql/fields.go b/metricbeat/module/mysql/fields.go
index c59ec303e3c6..b304521eb4b8 100644
--- a/metricbeat/module/mysql/fields.go
+++ b/metricbeat/module/mysql/fields.go
@@ -32,5 +32,5 @@ func init() {
 // AssetMysql returns asset data.
 // This is the base64 encoded zlib format compressed contents of module/mysql.
 func AssetMysql() string {
-	return "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"
+	return "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"
 }
diff --git a/metricbeat/module/mysql/performance/_meta/data.json b/metricbeat/module/mysql/performance/_meta/data.json
index 57d4a044d939..c0f0a44243a2 100644
--- a/metricbeat/module/mysql/performance/_meta/data.json
+++ b/metricbeat/module/mysql/performance/_meta/data.json
@@ -1,62 +1,82 @@
 {
-    "@timestamp": "2020-07-13T13:43:28.495Z",
+    "@timestamp": "2024-02-27T07:33:02.881Z",
     "@metadata": {
         "beat": "metricbeat",
         "type": "_doc",
-        "version": "8.0.0"
-    },
-    "event": {
-        "duration": 1379935,
-        "dataset": "mysql.performance",
-        "module": "mysql"
-    },
-    "metricset": {
-        "name": "performance",
-        "period": 10000
-    },
-    "service": {
-        "address": "tcp(172.17.0.2:3306)/",
-        "type": "mysql"
+        "version": "8.14.0"
     },
     "mysql": {
         "performance": {
             "events_statements": {
                 "digest": {
-                    "text": "SELECT @@SESSION . `auto_increment_increment` AS `auto_increment_increment` , @@`character_set_client` AS `character_set_client` , @@`character_set_connection` AS `character_set_connection` , @@`character_set_results` AS `character_set_results` , @@`character_set_server` AS `character_set_server` , @@`collation_server` AS `collation_server` , @@`collation_connection` AS `collation_connection` , @@`init_connect` AS `init_connect` , @@`interactive_timeout` AS `interactive_timeout` , @@`license` AS `license` , @@`lower_case_table_names` AS `lower_case_table_names` , @@`max_allowed_packet` AS `max_allowed_packet` , @@`net_write_timeout` AS `net_write_timeout` , @@`performance_schema` AS `performance_schema` , @@`sql_mode` AS `sql_mode` , @@`system_time_zone` AS `system_time_zone` , @@`time_zone` AS `time_zone` , @@`transaction_isolation` AS `transaction_isolation` , @@`wait_timeout` AS `wait_timeout`"
+                    "text": "SHOW SCHEMAS"
                 },
                 "count": {
-                    "star": 2
+                    "star": 5
                 },
                 "avg": {
                     "timer": {
-                        "wait": 1.78294e+08
+                        "wait": 1.6439131e+10
                     }
                 },
                 "max": {
                     "timer": {
-                        "wait": 1.89622e+08
+                        "wait": 4.0834164e+10
                     }
                 },
                 "last": {
-                    "seen": "2020-07-13 10:04:47.709230"
+                    "seen": "2024-02-27 06:44:17.296246"
                 },
                 "quantile": {
-                    "95": 1.90546071e+08
-                }
+                    "95": 4.1686938347e+10
+                },
+                "schema": "performance_schema"
             }
         }
     },
-    "ecs": {
-        "version": "1.5.0"
-    },
     "host": {
-        "name": "mcastro"
+        "id": "41359f29035549cda159ae8d1a533d72",
+        "containerized": false,
+        "ip": [
+            "127.0.0.1"
+        ],
+        "name": "localhost",
+        "mac": [
+            "86-32-76-45-EB-2B"
+        ],
+        "hostname": "localhost",
+        "architecture": "x86_64",
+        "os": {
+            "name": "CentOS Linux",
+            "kernel": "3.10.0-1160.102.1.el7.x86_64",
+            "codename": "Core",
+            "type": "linux",
+            "platform": "centos",
+            "version": "7 (Core)",
+            "family": "redhat"
+        }
     },
     "agent": {
-        "id": "803dfdba-e638-4590-a2de-80cb1cebe78d",
-        "name": "mcastro",
         "type": "metricbeat",
-        "version": "8.0.0",
-        "ephemeral_id": "f87e6edc-2f37-45f2-9644-b67b1834abfd"
+        "version": "8.14.0",
+        "ephemeral_id": "539a163b-91ab-433c-9893-31a48d09b5a7",
+        "id": "e5bcfbf0-4c74-44dd-b711-c5e90a69ab7a",
+        "name": "localhost"
+    },
+    "ecs": {
+        "version": "8.0.0"
+    },
+    "event": {
+        "dataset": "mysql.performance",
+        "module": "mysql",
+        "duration": 14244062
+    },
+    "metricset": {
+        "period": 10000,
+        "name": "performance"
+    },
+    "service": {
+        "address": "tcp(127.0.0.1:3306)/?readTimeout=10s&timeout=10s&writeTimeout=10s",
+        "type": "mysql"
     }
 }
diff --git a/metricbeat/module/mysql/performance/_meta/fields.yml b/metricbeat/module/mysql/performance/_meta/fields.yml
index 9e2c0940b737..205da8a0fed4 100644
--- a/metricbeat/module/mysql/performance/_meta/fields.yml
+++ b/metricbeat/module/mysql/performance/_meta/fields.yml
@@ -26,6 +26,9 @@
         - name: 'avg.timer.wait'
           type: long
           description: Average wait time of the summarized events that are timed
+        - name: 'schema'
+          type: keyword
+          description: Schema name.
     - name: table_io_waits
       type: group
       description: Records table I/O waits by index
diff --git a/metricbeat/module/mysql/performance/manifest.yml b/metricbeat/module/mysql/performance/manifest.yml
index 84eb953ab952..d01389c3caf4 100644
--- a/metricbeat/module/mysql/performance/manifest.yml
+++ b/metricbeat/module/mysql/performance/manifest.yml
@@ -6,7 +6,7 @@ input:
     namespace: performance
     queries:
       - query: >
-          SELECT digest_text, count_star, avg_timer_wait, max_timer_wait, last_seen /*!80001 ,quantile_95 */ 
+          SELECT schema_name AS schema, digest_text, count_star, avg_timer_wait, max_timer_wait, last_seen /*!80001 ,quantile_95 */ 
             FROM performance_schema.events_statements_summary_by_digest 
             ORDER BY avg_timer_wait DESC 
             LIMIT 10;