From b968bd2fd87d0fc8ff26324f3928216c6fa2fc45 Mon Sep 17 00:00:00 2001
From: Administrator <chenjian835@163.com>
Date: Wed, 7 Dec 2022 18:03:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=BF=9E=E6=8E=A5=E5=9C=B0=E5=9D=80=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/alibaba/polardbx/server/TddlLauncher.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/polardbx-server/src/main/java/com/alibaba/polardbx/server/TddlLauncher.java b/polardbx-server/src/main/java/com/alibaba/polardbx/server/TddlLauncher.java
index 6a1c68c79..21c88fe6e 100644
--- a/polardbx-server/src/main/java/com/alibaba/polardbx/server/TddlLauncher.java
+++ b/polardbx-server/src/main/java/com/alibaba/polardbx/server/TddlLauncher.java
@@ -165,6 +165,7 @@ private static void initUserAccount(SystemConfig config) throws SQLException, IO
 
         String metaDatabase = config.getMetaDbName();
         String innerUser = config.getMetaDbUser();
+        String metaDbProp = config.getMetaDbProp();
         String innerPasswd = PasswdUtil.genRandomPasswd(12);
         String innerPasswdEnc = PasswdUtil.encrypt(innerPasswd);
         config.setMetaDbPasswd(PasswdUtil.encrypt(innerPasswd));
@@ -182,7 +183,7 @@ private static void initUserAccount(SystemConfig config) throws SQLException, IO
             metaDbAddr.getKey(),
             metaDbAddr.getValue(),
             rootDb,
-            "",
+            metaDbProp,
             rootUser,
             rootPasswd)) {
 
@@ -230,7 +231,7 @@ private static void createInnerUser(SystemConfig config, String addr, String pas
         String sqlCreateUser = "CREATE USER %s IDENTIFIED WITH mysql_native_password BY '%s'";
         String sqlGrantPrivileges = "GRANT ALL PRIVILEGES ON *.* TO %s";
         String innerUser = config.getMetaDbUser();
-
+        String metaDbProp = config.getMetaDbProp();
         Pair<String, Integer> ipPort = AddressUtils.getIpPortPairByAddrStr(addr);
 
         String rootDb = "mysql";
@@ -241,7 +242,7 @@ private static void createInnerUser(SystemConfig config, String addr, String pas
             ipPort.getKey(),
             ipPort.getValue(),
             rootDb,
-            "",
+            metaDbProp,
             rootUser,
             rootPasswd)) {
 

From 07ce38b8cdd7e18f18916a551529e273c6e75bc7 Mon Sep 17 00:00:00 2001
From: "liugaoji.lgj" <liugaoji.lgj@alibaba-inc.com>
Date: Thu, 7 Nov 2024 17:35:27 +0800
Subject: [PATCH 2/2] fix pom version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a2a146066..64f1db172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <logback_version>1.2.3</logback_version>
         <groovy_version>2.1.9</groovy_version>
         <spring_version>2.5.6.SEC03</spring_version>
-        <mysql_connector_version>5.1.49</mysql_connector_version>
+        <mysql_connector_version>5.1.40.13</mysql_connector_version>
         <!-- Test libs -->
         <junit_version>4.12</junit_version>
         <lombok.version>1.18.10</lombok.version>