Merge upstream changes

.gitignore

@@ -3,3 +3,4 @@ Cargo.lock
 .idea
 mysql_async.iml
 .direnv
+.vscode

Cargo.toml

@@ -3,45 +3,54 @@ authors = ["blackbeam <aikorsky@gmail.com>"]
 description = "Tokio based asynchronous MySql client library."
 documentation = "https://docs.rs/mysql_async"
 keywords = ["mysql", "database", "asynchronous", "async"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 name = "mysql_async"
 readme = "README.md"
 repository = "https://github.com/blackbeam/mysql_async"
-version = "0.31.3"
+version = "0.36.1"
 exclude = ["test/*"]
-edition = "2018"
+edition = "2021"
 categories = ["asynchronous", "database"]
 
 [dependencies]
-bytes = "1.0"
-crossbeam = "0.8.1"
+bytes = "1.4"
+crossbeam-queue = "0.3"
 flate2 = { version = "1.0", default-features = false }
 futures-core = "0.3"
 futures-util = "0.3"
 futures-sink = "0.3"
-lazy_static = "1"
-lru = "0.8.1"
-mio = { version = "0.8.0", features = ["os-poll", "net"] }
-mysql_common = { version = "0.29.2", default-features = false }
-once_cell = "1.7.2"
-pem = "1.0.1"
+keyed_priority_queue = "0.4"
+lazy_static = "1.5"
+lru = "0.14.0"
+mysql_common = { version = "0.35.4", default-features = false }
+pem = "3.0"
 percent-encoding = "2.1.0"
-pin-project = "1.0.2"
-priority-queue = "1"
+rand = "0.9"
 serde = "1"
 serde_json = "1"
-socket2 = "0.4.2"
-thiserror = "1.0.4"
-tokio = { version = "1.0", features = ["io-util", "fs", "net", "time", "rt"] }
+socket2 = "0.5.2"
+thiserror = "2"
+tokio = { version = "1.0", features = [
+    "io-util",
+    "fs",
+    "net",
+    "time",
+    "rt",
+    "sync",
+] }
 tokio-util = { version = "0.7.2", features = ["codec", "io"] }
-tracing = { version = "0.1.37", default-features = false, features = ["attributes"], optional = true }
-twox-hash = "1"
+tracing = { version = "0.1.37", default-features = false, features = [
+    "attributes",
+], optional = true }
+twox-hash = { version = "2", default-features = false, features = ["xxhash64"] }
 url = "2.1"
 regex = "1.10.3"
+hdrhistogram = { version = "7.5", optional = true }
 lexical = "6.1.0"
 
 [dependencies.tokio-rustls]
-version = "0.23.4"
+version = "0.26"
+default-features = false
 optional = true
 
 [dependencies.tokio-native-tls]
@@ -53,56 +62,66 @@ version = "0.2"
 optional = true
 
 [dependencies.rustls]
-version = "0.20.0"
-features = ["dangerous_configuration"]
+version = "0.23"
+default-features = false
+features = ["std"]
 optional = true
 
 [dependencies.rustls-pemfile]
-version = "1.0.1"
-optional = true
-
-[dependencies.webpki]
-version = "0.22.0"
+version = "2.1.0"
 optional = true
 
 [dependencies.webpki-roots]
-version = "0.22.1"
+version = "0.26.1"
 optional = true
 
 [dev-dependencies]
+waker-fn = "1"
 tempfile = "3.1.0"
-socket2 = { version = "0.4.0", features = ["all"] }
+socket2 = { version = "0.5.2", features = ["all"] }
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread"] }
-rand = "0.8.0"
 
 [features]
-default = [
-    "flate2/zlib",
-    "mysql_common/bigdecimal03",
-    "mysql_common/rust_decimal",
-    "mysql_common/time03",
-    "mysql_common/uuid",
-    "mysql_common/frunk",
-    "native-tls-tls",
-]
-default-rustls = [
-    "flate2/zlib",
-    "mysql_common/bigdecimal03",
-    "mysql_common/rust_decimal",
-    "mysql_common/time03",
-    "mysql_common/uuid",
-    "mysql_common/frunk",
+default = ["flate2/zlib", "derive"]
+
+default-rustls = ["default-rustls-no-provider", "aws-lc-rs"]
+
+default-rustls-ring = ["default-rustls-no-provider", "ring"]
+
+default-rustls-no-provider = [
+    "flate2/rust_backend",
+    "derive",
     "rustls-tls",
+    "tls12",
 ]
+
+# minimal feature set with system flate2 impl
 minimal = ["flate2/zlib"]
+# minimal feature set with rust flate2 impl
+minimal-rust = ["flate2/rust_backend"]
+
+# native-tls based TLS support
 native-tls-tls = ["native-tls", "tokio-native-tls"]
-rustls-tls = [
-    "rustls",
-    "tokio-rustls",
-    "webpki",
-    "webpki-roots",
-    "rustls-pemfile",
-]
+
+# rustls based TLS support
+rustls-tls = ["rustls", "tokio-rustls", "webpki-roots", "rustls-pemfile"]
+
+aws-lc-rs = ["rustls/aws_lc_rs", "tokio-rustls/aws_lc_rs"]
+ring = ["rustls/ring", "tokio-rustls/ring"]
+tls12 = ["rustls/tls12", "tokio-rustls/tls12"]
+
+binlog = ["mysql_common/binlog"]
+
+# mysql_common features
+derive = ["mysql_common/derive"]
+chrono = ["mysql_common/chrono"]
+time = ["mysql_common/time"]
+bigdecimal = ["mysql_common/bigdecimal"]
+rust_decimal = ["mysql_common/rust_decimal"]
+frunk = ["mysql_common/frunk"]
+client_ed25519 = ["mysql_common/client_ed25519"]
+
+# other features
 tracing = ["dep:tracing"]
 nightly = []
 vendored-openssl = ["tokio-native-tls/vendored", "native-tls/vendored"]

README.md

@@ -20,8 +20,10 @@ mysql_async = "<desired version>"
 
 ## Crate Features
 
-Default feature set is wide – it includes all default [`mysql_common` features][myslqcommonfeatures]
-as well as `native-tls`-based TLS support.
+By default there are only two features enabled:
+
+*   `flate2/zlib` — choosing flate2 backend is mandatory
+*   `derive` — see ["Derive Macros" section in `mysql_common` docs][mysqlcommonderive]
 
 ### List Of Features
 
@@ -37,25 +39,18 @@ as well as `native-tls`-based TLS support.
     mysql_async = { version = "*", default-features = false, features = ["minimal"]}
     ```
 
-    **Note:* it is possible to use another `flate2` backend by directly choosing it:
+*   `minimal-rust` - same as `minimal` but with rust-based flate2 backend. Enables:
 
-    ```toml
-    [dependencies]
-    mysql_async = { version = "*", default-features = false }
-    flate2 = { version = "*", default-features = false, features = ["rust_backend"] }
-    ```
+    -    `flate2/rust_backend`
 
-*   `default` – enables the following set of crate's and dependencies' features:
+*   `default` – enables the following set of features:
 
-    -   `native-tls-tls`
-    -   `flate2/zlib"
-    -   `mysql_common/bigdecimal03`
-    -   `mysql_common/rust_decimal`
-    -   `mysql_common/time03`
-    -   `mysql_common/uuid`
-    -   `mysql_common/frunk`
+    -   `flate2/zlib`
+    -   `derive`
 
-*   `default-rustls` – same as default but with `rustls-tls` instead of `native-tls-tls`.
+*   `default-rustls` – default set of features with TLS via `rustls/aws-lc-rs`
+
+*   `default-rustls-ring` – default set of features with TLS via `rustls/ring`
 
     **Example:**
 
@@ -64,21 +59,22 @@ as well as `native-tls`-based TLS support.
     mysql_async = { version = "*", default-features = false, features = ["default-rustls"] }
     ```
 
-*   `native-tls-tls` – enables `native-tls`-based TLS support _(conflicts with `rustls-tls`)_
+*   `native-tls-tls` – enables TLS via `native-tls`
 
     **Example:**
 
     ```toml
     [dependencies]
-    mysql_async = { version = "*", default-features = false, features = ["native-tls-tls"] }
+    mysql_async = { version = "*", default-features = false, features = ["minimal", "native-tls-tls"] }
 
-*   `rustls-tls` – enables `native-tls`-based TLS support _(conflicts with `native-tls-tls`)_
+*   `rustls-tls` - enables rustls TLS backend with no provider. You should enable one
+    of existing providers using `aws-lc-rs` or `ring` features:
 
     **Example:**
 
     ```toml
     [dependencies]
-    mysql_async = { version = "*", default-features = false, features = ["rustls-tls"] }
+    mysql_async = { version = "*", default-features = false, features = ["minimal-rust", "rustls-tls", "ring"] }
 
 *   `tracing` – enables instrumentation via `tracing` package.
 
@@ -94,7 +90,21 @@ as well as `native-tls`-based TLS support.
     mysql_async = { version = "*", features = ["tracing"] }
     ```
 
+*   `binlog` - enables binlog-related functionality. Enables:
+
+    -   `mysql_common/binlog"
+
+#### Proxied features (see [`mysql_common`` fatures][myslqcommonfeatures])
+
+*   `derive` – enables `mysql_common/derive` feature
+*   `chrono` = enables `mysql_common/chrono` feature
+*   `time` = enables `mysql_common/time` feature
+*   `bigdecimal` = enables `mysql_common/bigdecimal` feature
+*   `rust_decimal` = enables `mysql_common/rust_decimal` feature
+*   `frunk` = enables `mysql_common/frunk` feature
+
 [myslqcommonfeatures]: https://github.com/blackbeam/rust_mysql_common#crate-features
+[mysqlcommonderive]: https://github.com/blackbeam/rust_mysql_common?tab=readme-ov-file#derive-macros
 
 ## TLS/SSL Support
 
@@ -190,7 +200,7 @@ Please note:
 * [`Pool`] is a smart pointer – each clone will point to the same pool instance.
 * [`Pool`] is `Send + Sync + 'static` – feel free to pass it around.
 * use [`Pool::disconnect`] to gracefuly close the pool.
-* [`Pool::new`] is lazy and won't assert server availability.
+* ⚠️ [`Pool::new`] is lazy and won't assert server availability.
 
 ## Transaction