diff --git a/include/boost/mysql/detail/connection_pool/connection_node.hpp b/include/boost/mysql/detail/connection_pool/connection_node.hpp index aecf43a58..1942bb513 100644 --- a/include/boost/mysql/detail/connection_pool/connection_node.hpp +++ b/include/boost/mysql/detail/connection_pool/connection_node.hpp @@ -62,7 +62,7 @@ inline internal_pool_params make_internal_pool_params(pool_params&& params) std::move(params.username), std::move(params.password), std::move(params.database), - params.connection_collation, + handshake_params::default_collation, // reset wipes out this. TODO: figure out a way params.ssl, params.multi_queries}, { diff --git a/include/boost/mysql/pool_params.hpp b/include/boost/mysql/pool_params.hpp index f36c7772d..f859b4e3a 100644 --- a/include/boost/mysql/pool_params.hpp +++ b/include/boost/mysql/pool_params.hpp @@ -28,12 +28,11 @@ struct pool_params std::string username; std::string password; std::string database; - std::uint16_t connection_collation{handshake_params::default_collation}; ssl_mode ssl{ssl_mode::require}; bool multi_queries{}; std::size_t initial_read_buffer_size{buffer_params::default_initial_read_size}; std::size_t initial_size{1}; - std::size_t max_size{150}; + std::size_t max_size{151}; bool enable_thread_safety{true}; asio::ssl::context* ssl_ctx{}; std::chrono::steady_clock::duration connect_timeout{std::chrono::seconds(20)}; diff --git a/test/integration/test/connection_pool.cpp b/test/integration/test/connection_pool.cpp index d671fc050..251beb38e 100644 --- a/test/integration/test/connection_pool.cpp +++ b/test/integration/test/connection_pool.cpp @@ -300,7 +300,7 @@ BOOST_AUTO_TEST_CASE(get_connection_diagnostics) // Try to get a connection. This times out, but will return // the connection's diagnostics, instead - auto conn = pool.async_get_connection(std::chrono::milliseconds(5), diag, yield[ec]); + auto conn = pool.async_get_connection(std::chrono::milliseconds(10), diag, yield[ec]); BOOST_TEST(ec == common_server_errc::er_access_denied_error); validate_string_contains(diag.server_message(), {"access denied"}); });