This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch fix_storage-jdbc
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 2f70190a2be0f7e4008a160979eaa2b4e6f6f306
Author: JaredTan95 <jian....@daocloud.io>
AuthorDate: Wed Nov 4 10:36:33 2020 +0800

    fix null catalog
---
 .../oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java
 
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java
index 62f615f..978098b 100644
--- 
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java
+++ 
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java
@@ -58,7 +58,7 @@ public class MySQLTableInstaller extends H2TableInstaller {
         TableMetaInfo.addModel(model);
         JDBCHikariCPClient h2Client = (JDBCHikariCPClient) client;
         try (Connection conn = h2Client.getConnection()) {
-            try (ResultSet rset = conn.getMetaData().getTables(null, null, 
model.getName(), null)) {
+            try (ResultSet rset = 
conn.getMetaData().getTables(conn.getCatalog(), null, model.getName(), null)) {
                 if (rset.next()) {
                     return true;
                 }

Reply via email to