diff --git a/contrib/libfiu b/contrib/libfiu index 7ae4328050c..b85edbde4cf 160000 --- a/contrib/libfiu +++ b/contrib/libfiu @@ -1 +1 @@ -Subproject commit 7ae4328050ccad8867a05a37af941886f717b6fc +Subproject commit b85edbde4cf974b1b40d27828a56f0505f4e2ee5 diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md index ad7ef52412a..2cb84203d50 100644 --- a/docs/en/operations/settings/settings.md +++ b/docs/en/operations/settings/settings.md @@ -1125,6 +1125,12 @@ If unsuccessful, several attempts are made to connect to various replicas. Default value: 1000. +## connect_timeout_with_failover_secure_ms + +Connection timeout for selecting first healthy replica (for secure connections) + +Default value: 1000. + ## connection_pool_max_wait_ms {#connection-pool-max-wait-ms} The wait time in milliseconds for a connection when the connection pool is full. diff --git a/src/Core/MySQL/Authentication.cpp b/src/Core/MySQL/Authentication.cpp index e6de8c38905..2c10bd88722 100644 --- a/src/Core/MySQL/Authentication.cpp +++ b/src/Core/MySQL/Authentication.cpp @@ -31,7 +31,7 @@ namespace Authentication static const size_t SCRAMBLE_LENGTH = 20; /** Generate a random string using ASCII characters but avoid separator character, - * produce pseudo random numbers between with about 7 bit worth of entropty between 1-127. + * produce pseudo random numbers between with about 7 bit worth of entropy between 1-127. * https://github.com/mysql/mysql-server/blob/8.0/mysys/crypt_genhash_impl.cc#L427 */ static String generateScramble()