diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
index 2b50fc5cc1..623af02d7d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
@@ -102,6 +102,12 @@ implements
 
 
 
+
+
+            case MARIADB:
+            case MYSQL:
+                return true;
+
             case CLICKHOUSE:
                 return true;
 
@@ -135,6 +141,13 @@ implements
 
 
 
+
+
+            case MARIADB:
+            case MYSQL:
+                ctx.visit(function(N_DATABASE, getDataType()));
+                break;
+
             case CLICKHOUSE:
                 ctx.visit(function(N_currentDatabase, getDataType()));
                 break;