diff --git a/Cargo.lock b/Cargo.lock
index dcb25ec70958..9842fcac68a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1406,16 +1406,14 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
+ "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "regex",
@@ -5072,7 +5070,7 @@ dependencies = [
  "regex",
  "reqwest",
  "rmp-serde",
- "rustls 0.22.4",
+ "rustls 0.23.18",
  "rustls-pemfile 2.1.3",
  "rustls-pki-types",
  "rustyline",
@@ -8273,7 +8271,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "hyper-util",
- "rustls 0.23.12",
+ "rustls 0.23.18",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.0",
@@ -9068,12 +9066,6 @@ dependencies = [
  "spin",
 ]
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "leb128"
 version = "0.2.5"
@@ -9758,14 +9750,13 @@ dependencies = [
 [[package]]
 name = "msql-srv"
 version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b821d09e9a4ed6b61015a889597446b3b6c7721544d0f4b617bcfdacf6ee7877"
+source = "git+https://github.com/databendlabs/msql-srv.git?rev=cd443dd#cd443dd062e2d64e029c82d7114ce5a6b324f73c"
 dependencies = [
  "byteorder",
  "chrono",
  "mysql_common 0.31.0",
  "nom",
- "rustls 0.22.4",
+ "rustls 0.23.18",
 ]
 
 [[package]]
@@ -10432,18 +10423,18 @@ dependencies = [
 
 [[package]]
 name = "opensrv-mysql"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4148ab944991b0a33be74d2636a815268974578812a9e4cf7dc785325e858154"
+version = "0.8.0"
+source = "git+https://github.com/databendlabs/opensrv.git?rev=a1fb4da#a1fb4da215c8693c7e4f62be249a01b7fec52997"
 dependencies = [
  "async-trait",
  "byteorder",
+ "bytes",
  "chrono",
  "mysql_common 0.32.4",
  "nom",
  "pin-project-lite",
  "tokio",
- "tokio-rustls 0.25.0",
+ "tokio-rustls 0.26.0",
 ]
 
 [[package]]
@@ -11815,7 +11806,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustls 0.23.18",
  "socket2",
  "thiserror",
  "tokio",
@@ -11832,7 +11823,7 @@ dependencies = [
  "rand",
  "ring",
  "rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustls 0.23.18",
  "slab",
  "thiserror",
  "tinyvec",
@@ -12228,7 +12219,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.12",
+ "rustls 0.23.18",
  "rustls-pemfile 2.1.3",
  "rustls-pki-types",
  "serde",
@@ -12619,29 +12610,15 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring",
- "rustls-pki-types",
- "rustls-webpki 0.102.6",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.12"
+version = "0.23.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f"
 dependencies = [
  "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.6",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
@@ -12692,9 +12669,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
@@ -12708,9 +12685,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -14502,24 +14479,13 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.12",
+ "rustls 0.23.18",
  "rustls-pki-types",
  "tokio",
 ]
@@ -15074,7 +15040,7 @@ dependencies = [
  "flate2",
  "log",
  "once_cell",
- "rustls 0.23.12",
+ "rustls 0.23.18",
  "rustls-pki-types",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 0b82af877c9b..87be2fb47c36 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -375,7 +375,7 @@ openraft = { version = "0.10.0", features = [
     "tracing-log",
     "loosen-follower-log-revert", # allows removing all data from a follower and restoring from the leader.
 ] }
-opensrv-mysql = { version = "0.7.0", features = ["tls"] }
+opensrv-mysql = { git = "https://github.com/databendlabs/opensrv.git", rev = "a1fb4da", features = ["tls"] }
 orc-rust = "0.5.0"
 ordered-float = { version = "4.5.0", default-features = false }
 ordq = "0.2.0"
@@ -424,7 +424,7 @@ roaring = { version = "0.10.1", features = ["serde"] }
 rotbl = { version = "0.1.2", features = [] }
 rust_decimal = "1.26"
 rustix = "0.38.37"
-rustls = "0.22" # FIXME: we should bump to 0.23
+rustls = { version = "0.23.18", features = ["ring", "tls12"], default-features = false }
 rustls-pemfile = "2"
 rustls-pki-types = "1"
 rustyline = "14"
@@ -536,7 +536,7 @@ tracing-appender = "0.2.3"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json", "valuable"] }
 
 # Databend Integration Test
-msql-srv = "0.11.0"
+msql-srv = { git = "https://github.com/databendlabs/msql-srv.git", rev = "cd443dd" }
 mysql_common = "0.32.4"
 quickcheck = "1.0"
 sqllogictest = "0.21.0"
diff --git a/src/query/expression/src/kernels/group_by_hash/utils.rs b/src/query/expression/src/kernels/group_by_hash/utils.rs
index 280edbe6e850..d682067e373d 100644
--- a/src/query/expression/src/kernels/group_by_hash/utils.rs
+++ b/src/query/expression/src/kernels/group_by_hash/utils.rs
@@ -40,7 +40,7 @@ pub fn serialize_group_columns(
         }
         builder.commit_row();
     }
-    // For nulllable column it will only serialize valid row data
+    // For nullable column it will only serialize valid row data
     debug_assert!(builder.data.len() <= serialize_size);
     builder.build()
 }
diff --git a/src/query/service/src/servers/admin/admin_service.rs b/src/query/service/src/servers/admin/admin_service.rs
index c6454ea0af21..61b3f6731f9a 100644
--- a/src/query/service/src/servers/admin/admin_service.rs
+++ b/src/query/service/src/servers/admin/admin_service.rs
@@ -184,7 +184,7 @@ impl Server for AdminService {
     async fn shutdown(&mut self, _graceful: bool) {
         // intendfully do nothing: sometimes we hope to diagnose the backtraces or metrics after
         // the process got the sigterm signal, we can still leave the admin service port open until
-        // the process exited. it's not an user facing service, it's allowed to shutdown forcely.
+        // the process exited. it's not an user facing service, it's allowed to force shutdown.
     }
 
     #[async_backtrace::framed]
diff --git a/tests/suites/1_stateful/09_http_handler/09_0001_json_response.result b/tests/suites/1_stateful/09_http_handler/09_0001_json_response.result
index d7cb376029cd..0c22e50db4d7 100755
--- a/tests/suites/1_stateful/09_http_handler/09_0001_json_response.result
+++ b/tests/suites/1_stateful/09_http_handler/09_0001_json_response.result
@@ -1,3 +1,3 @@
-{"code":1025,"message":"error: \n  --> SQL:1:15\n  |\n1 | select * from t1\n  |               ^^ Unknown table \"default\".\"default\".t1 .\n\n"}
+{"code":1025,"message":"error: \n  --> SQL:1:15\n  |\n1 | select * from system.t1\n  |               ^^^^^^^^^ Unknown table \"default\".system.t1 .\n\n"}
 {"error":{"code":400,"message":"parse error: key must be a string at line 1 column 2"}}
 {"error":{"code":404,"message":"not found"}}
diff --git a/tests/suites/1_stateful/09_http_handler/09_0001_json_response.sh b/tests/suites/1_stateful/09_http_handler/09_0001_json_response.sh
index 0bb648ddc668..ef9bf8fcb098 100755
--- a/tests/suites/1_stateful/09_http_handler/09_0001_json_response.sh
+++ b/tests/suites/1_stateful/09_http_handler/09_0001_json_response.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 echo "drop table if exists t1;" | $BENDSQL_CLIENT_CONNECT
 
-curl -s --header 'Content-Type: application/json'  --request POST '127.0.0.1:8000/v1/query/'  --data-raw '{"sql": "select * from t1", "pagination": { "wait_time_secs": 2}}' -u root: | jq -c ".error"
+curl -s --header 'Content-Type: application/json'  --request POST '127.0.0.1:8000/v1/query/'  --data-raw '{"sql": "select * from system.t1", "pagination": { "wait_time_secs": 2}}' -u root: | jq -c ".error"
 
 curl -s --header 'Content-Type: application/json'  --request POST '127.0.0.1:8000/v1/query/'  --data-raw '{sql": "select * from tx", "pagination": { "wait_time_secs": 2}}' -u root:
 echo ""