diff --git a/Cargo.lock b/Cargo.lock index a460533e72..344edf2c9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1053,7 +1053,7 @@ dependencies = [ "bitflags 2.9.0", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "proc-macro2", "quote", "regex", @@ -2432,9 +2432,9 @@ dependencies = [ "humantime-serde", "num_cpus", "rskafka", - "rustls 0.23.20", + "rustls", "rustls-native-certs 0.7.3", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "serde", "serde_json", "serde_with", @@ -2752,9 +2752,9 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] @@ -5225,27 +5225,28 @@ dependencies = [ "pin-project-lite", "rustls-native-certs 0.7.3", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", ] [[package]] name = "hyper-rustls" -version = "0.27.3" -source = "git+https://github.com/GreptimeTeam/hyper-rustls?rev=a951e03#a951e03fb914f1830e244400472814d38775118d" +version = "0.27.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.4.1", "hyper-util", "log", - "rustls 0.23.20", + "rustls", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", - "webpki-roots 0.26.6", + "webpki-roots", ] [[package]] @@ -6023,8 +6024,8 @@ dependencies = [ "k8s-openapi", "kube-core", "pem", - "rustls 0.23.20", - "rustls-pemfile 2.2.0", + "rustls", + "rustls-pemfile", "secrecy", "serde", "serde_json", @@ -6253,7 +6254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -6512,7 +6513,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" dependencies = [ - "twox-hash", + "twox-hash 1.6.3", ] [[package]] @@ -6844,18 +6845,6 @@ dependencies = [ "adler2", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.0.2" @@ -7025,48 +7014,28 @@ checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "mysql" -version = "25.0.1" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ad644efb545e459029b1ffa7c969d830975bd76906820913247620df10050b" +checksum = "64453aedc258ac8c720b46c8264302fad39cef6c02483f68adbad4bcd22d6fab" dependencies = [ "bufstream", "bytes", - "crossbeam", + "crossbeam-queue", "flate2", "io-enum", "libc", "lru", - "mysql_common 0.32.4", + "mysql_common 0.34.1", "named_pipe", "pem", "percent-encoding", - "rustls 0.23.20", - "rustls-pemfile 2.2.0", - "serde", - "serde_json", + "rustls", + "rustls-pemfile", "socket2", - "twox-hash", + "twox-hash 2.1.0", "url", "webpki", - "webpki-roots 0.26.6", -] - -[[package]] -name = "mysql-common-derive" -version = "0.30.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" -dependencies = [ - "darling 0.20.10", - "heck 0.4.1", - "num-bigint", - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.96", - "termcolor", - "thiserror 1.0.64", + "webpki-roots", ] [[package]] @@ -7088,10 +7057,28 @@ dependencies = [ ] [[package]] -name = "mysql_async" -version = "0.33.0" +name = "mysql-common-derive" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6750b17ce50f8f112ef1a8394121090d47c596b56a6a17569ca680a9626e2ef2" +checksum = "deb6d9ff4094f6d58d3f892fc558e60048476213dd17dcf904b62202e9029da6" +dependencies = [ + "darling 0.20.10", + "heck 0.5.0", + "num-bigint", + "proc-macro-crate 3.2.0", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.96", + "termcolor", + "thiserror 1.0.64", +] + +[[package]] +name = "mysql_async" +version = "0.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d14cf024116ba8fef4a7fec5abf0bd5de89b9fb29a7e55818a119ac5ec745077" dependencies = [ "bytes", "crossbeam", @@ -7100,67 +7087,25 @@ dependencies = [ "futures-sink", "futures-util", "keyed_priority_queue", - "lazy_static", "lru", - "mio 0.8.11", - "mysql_common 0.31.0", - "once_cell", + "mysql_common 0.34.1", "pem", "percent-encoding", "pin-project", "rand 0.8.5", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "rustls", + "rustls-pemfile", "serde", "serde_json", "socket2", - "thiserror 1.0.64", + "thiserror 2.0.12", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", - "twox-hash", + "twox-hash 2.1.0", "url", "webpki", - "webpki-roots 0.25.4", -] - -[[package]] -name = "mysql_common" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" -dependencies = [ - "base64 0.21.7", - "bigdecimal 0.4.5", - "bindgen", - "bitflags 2.9.0", - "bitvec", - "btoi", - "byteorder", - "bytes", - "cc", - "cmake", - "crc32fast", - "flate2", - "frunk", - "lazy_static", - "mysql-common-derive 0.30.2", - "num-bigint", - "num-traits", - "rand 0.8.5", - "regex", - "rust_decimal", - "saturating", - "serde", - "serde_json", - "sha1", - "sha2", - "smallvec", - "subprocess", - "thiserror 1.0.64", - "time", - "uuid", - "zstd 0.12.4", + "webpki-roots", ] [[package]] @@ -7203,6 +7148,39 @@ dependencies = [ "zstd 0.13.2", ] +[[package]] +name = "mysql_common" +version = "0.34.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34a9141e735d5bb02414a7ac03add09522466d4db65bdd827069f76ae0850e58" +dependencies = [ + "base64 0.22.1", + "bitflags 2.9.0", + "btoi", + "byteorder", + "bytes", + "cc", + "cmake", + "crc32fast", + "flate2", + "lazy_static", + "mysql-common-derive 0.32.0", + "num-bigint", + "num-traits", + "rand 0.8.5", + "regex", + "saturating", + "serde", + "serde_json", + "sha1", + "sha2", + "subprocess", + "thiserror 1.0.64", + "time", + "uuid", + "zstd 0.13.2", +] + [[package]] name = "nalgebra" version = "0.29.0" @@ -7370,7 +7348,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio 1.0.2", + "mio", "notify-types", "walkdir", "windows-sys 0.59.0", @@ -7670,8 +7648,8 @@ dependencies = [ [[package]] name = "opensrv-mysql" -version = "0.7.0" -source = "git+https://github.com/datafuselabs/opensrv?rev=6bbc3b65e6b19212c4f7fc4f40c20daf6f452deb#6bbc3b65e6b19212c4f7fc4f40c20daf6f452deb" +version = "0.8.0" +source = "git+https://github.com/datafuselabs/opensrv?rev=a1fb4da215c8693c7e4f62be249a01b7fec52997#a1fb4da215c8693c7e4f62be249a01b7fec52997" dependencies = [ "async-trait", "byteorder", @@ -7681,7 +7659,7 @@ dependencies = [ "nom", "pin-project-lite", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", ] [[package]] @@ -8085,7 +8063,7 @@ dependencies = [ "snap", "thrift", "tokio", - "twox-hash", + "twox-hash 1.6.3", "zstd 0.13.2", "zstd-sys", ] @@ -8294,7 +8272,7 @@ dependencies = [ "rust_decimal", "thiserror 2.0.12", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", ] @@ -8726,6 +8704,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", + "syn 2.0.96", ] [[package]] @@ -8888,7 +8867,7 @@ checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" dependencies = [ "bytes", "heck 0.5.0", - "itertools 0.11.0", + "itertools 0.13.0", "log", "multimap", "once_cell", @@ -8934,7 +8913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.96", @@ -9193,7 +9172,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.20", + "rustls", "socket2", "thiserror 1.0.64", "tokio", @@ -9210,7 +9189,7 @@ dependencies = [ "rand 0.8.5", "ring", "rustc-hash 2.0.0", - "rustls 0.23.20", + "rustls", "slab", "thiserror 1.0.64", "tinyvec", @@ -9625,16 +9604,16 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.20", + "rustls", "rustls-native-certs 0.8.0", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -9642,7 +9621,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.6", + "webpki-roots", "windows-registry", ] @@ -9793,11 +9772,11 @@ dependencies = [ "parking_lot 0.12.3", "rand 0.8.5", "rsasl", - "rustls 0.23.20", + "rustls", "snap", "thiserror 1.0.64", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tracing", "zstd 0.13.2", ] @@ -10027,26 +10006,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - -[[package]] -name = "rustls" -version = "0.23.20" -source = "git+https://github.com/GreptimeTeam/rustls?rev=34fd0c6#34fd0c6244af1501ca8f5b5c1c69afda67ce8fbb" +checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c" dependencies = [ "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "subtle", "zeroize", ] @@ -10058,7 +10026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "rustls-pki-types", "schannel", "security-framework", @@ -10071,21 +10039,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "rustls-pki-types", "schannel", "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -10097,25 +10056,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.103.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" dependencies = [ "ring", "rustls-pki-types", @@ -10307,16 +10256,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "seahash" version = "4.1.0" @@ -10622,8 +10561,8 @@ dependencies = [ "regex", "reqwest", "rust-embed", - "rustls 0.23.20", - "rustls-pemfile 2.2.0", + "rustls", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -10641,7 +10580,7 @@ dependencies = [ "tokio", "tokio-postgres", "tokio-postgres-rustls", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-stream", "tokio-util", "tonic 0.12.3", @@ -11153,8 +11092,8 @@ dependencies = [ "memchr", "once_cell", "percent-encoding", - "rustls 0.23.20", - "rustls-pemfile 2.2.0", + "rustls", + "rustls-pemfile", "serde", "serde_json", "sha2", @@ -11164,7 +11103,7 @@ dependencies = [ "tokio-stream", "tracing", "url", - "webpki-roots 0.26.6", + "webpki-roots", ] [[package]] @@ -12274,7 +12213,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", @@ -12363,30 +12302,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04fb792ccd6bbcd4bba408eb8a292f70fc4a3589e5d793626f45190e6454b6ab" dependencies = [ "ring", - "rustls 0.23.20", + "rustls", "tokio", "tokio-postgres", - "tokio-rustls 0.26.0", + "tokio-rustls", "x509-certificate", ] [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.21.12", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" -source = "git+https://github.com/GreptimeTeam/tokio-rustls?rev=4604ca6#4604ca6badfd1d10424718e5570cc481ab787fc8" -dependencies = [ - "rustls 0.23.20", - "rustls-pki-types", + "rustls", "tokio", ] @@ -12534,10 +12463,10 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.13.3", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "socket2", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-stream", "tower 0.4.13", "tower-layer", @@ -12934,10 +12863,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.8.5", "static_assertions", ] +[[package]] +name = "twox-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908" + [[package]] name = "typeid" version = "1.0.2" @@ -13487,12 +13421,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.6" @@ -13557,7 +13485,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -14168,15 +14096,6 @@ dependencies = [ "zstd-safe 5.0.2+zstd.1.5.2", ] -[[package]] -name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe 6.0.6", -] - [[package]] name = "zstd" version = "0.13.2" @@ -14196,16 +14115,6 @@ dependencies = [ "zstd-sys", ] -[[package]] -name = "zstd-safe" -version = "6.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" -dependencies = [ - "libc", - "zstd-sys", -] - [[package]] name = "zstd-safe" version = "7.2.1" diff --git a/Cargo.toml b/Cargo.toml index 8b432668be..262b5fe221 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -181,7 +181,8 @@ rstest = "0.25" rstest_reuse = "0.7" rust_decimal = "1.33" rustc-hash = "2.0" -rustls = { version = "0.23.20", default-features = false } # override by patch, see [patch.crates-io] +# It is worth noting that we should try to avoid using aws-lc-rs until it can be compiled on various platforms. +rustls = { version = "0.23.25", default-features = false } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["float_roundtrip"] } serde_with = "3" @@ -206,7 +207,7 @@ strum = { version = "0.27", features = ["derive"] } tempfile = "3" tokio = { version = "1.40", features = ["full"] } tokio-postgres = "0.7" -tokio-rustls = { version = "0.26.0", default-features = false } # override by patch, see [patch.crates-io] +tokio-rustls = { version = "0.26.2", default-features = false } tokio-stream = "0.1" tokio-util = { version = "0.7", features = ["io-util", "compat"] } toml = "0.8.8" @@ -282,15 +283,6 @@ store-api = { path = "src/store-api" } substrait = { path = "src/common/substrait" } table = { path = "src/table" } -[patch.crates-io] -# change all rustls dependencies to use our fork to default to `ring` to make it "just work" -hyper-rustls = { git = "https://github.com/GreptimeTeam/hyper-rustls", rev = "a951e03" } # version = "0.27.5" with ring patch -rustls = { git = "https://github.com/GreptimeTeam/rustls", rev = "34fd0c6" } # version = "0.23.20" with ring patch -tokio-rustls = { git = "https://github.com/GreptimeTeam/tokio-rustls", rev = "4604ca6" } # version = "0.26.0" with ring patch -# This is commented, since we are not using aws-lc-sys, if we need to use it, we need to uncomment this line or use a release after this commit, or it wouldn't compile with gcc < 8.1 -# see https://github.com/aws/aws-lc-rs/pull/526 -# aws-lc-sys = { git ="https://github.com/aws/aws-lc-rs", rev = "556558441e3494af4b156ae95ebc07ebc2fd38aa" } - [workspace.dependencies.meter-macros] git = "https://github.com/GreptimeTeam/greptime-meter.git" rev = "5618e779cf2bb4755b499c630fba4c35e91898cb" diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml index 6a6ea8d9d7..aa0ea0def2 100644 --- a/src/servers/Cargo.toml +++ b/src/servers/Cargo.toml @@ -80,9 +80,10 @@ once_cell.workspace = true openmetrics-parser = "0.4" simd-json.workspace = true socket2 = "0.5" -# use crates.io version after current revision is merged in next release -# opensrv-mysql = "0.7.0" -opensrv-mysql = { git = "https://github.com/datafuselabs/opensrv", rev = "6bbc3b65e6b19212c4f7fc4f40c20daf6f452deb" } +# use crates.io version once the following PRs is merged into the nextest release +# 1. fix: Use After Free in PacketReader in https://github.com/databendlabs/opensrv/pull/67 +# 2. Use ring, instead of aws-lc-rs in https://github.com/databendlabs/opensrv/pull/72 +opensrv-mysql = { git = "https://github.com/datafuselabs/opensrv", rev = "a1fb4da215c8693c7e4f62be249a01b7fec52997" } opentelemetry-proto.workspace = true parking_lot.workspace = true pgwire = { version = "0.28.0", default-features = false, features = ["server-api-ring"] } @@ -133,8 +134,8 @@ common-base.workspace = true common-test-util.workspace = true criterion = "0.5" json5 = "0.4" -mysql_async = { version = "0.33", default-features = false, features = [ - "default-rustls", +mysql_async = { version = "0.35", default-features = false, features = [ + "default-rustls-ring", ] } permutation = "0.4" rand.workspace = true diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml index f9045a2c4f..0ce38049ca 100644 --- a/tests-integration/Cargo.toml +++ b/tests-integration/Cargo.toml @@ -51,8 +51,9 @@ loki-proto.workspace = true meta-client.workspace = true meta-srv = { workspace = true, features = ["mock"] } moka.workspace = true -mysql_async = { version = "0.33", default-features = false, features = [ - "default-rustls", +mysql_async = { version = "0.35", default-features = false, features = [ + "time", + "default-rustls-ring", ] } object-store.workspace = true operator = { workspace = true, features = ["testing"] } diff --git a/tests/runner/Cargo.toml b/tests/runner/Cargo.toml index dfa28962f8..1d56796061 100644 --- a/tests/runner/Cargo.toml +++ b/tests/runner/Cargo.toml @@ -19,7 +19,7 @@ datatypes = { workspace = true } flate2 = "1.0" hex = "0.4" local-ip-address = "0.6" -mysql = { version = "25.0.1", default-features = false, features = ["minimal", "rustls-tls"] } +mysql = { version = "26", default-features = false, features = ["minimal", "rustls-tls-ring"] } num_cpus = "1.16" reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] } serde.workspace = true