database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Sergei Golubchik
2025-01-25 18:06:27 +01:00
parent 1135b92dd0 2d56f340c4
commit a99205eb36
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libmariadb/mariadb_lib.c
View File

@@ -403,6 +403,7 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
(socket) is still available */ (socket) is still available */
if (command != COM_QUIT && mysql->options.reconnect && ma_pvio_is_alive(mysql->net.pvio)) if (command != COM_QUIT && mysql->options.reconnect && ma_pvio_is_alive(mysql->net.pvio))
{ {
ma_pvio_close(mysql->net.pvio);
mysql->net.pvio= NULL; mysql->net.pvio= NULL;
mysql->net.error= 1; mysql->net.error= 1;
} }
@@ -2461,17 +2462,15 @@ void my_set_error(MYSQL *mysql,
void mysql_close_slow_part(MYSQL *mysql) void mysql_close_slow_part(MYSQL *mysql)
{ {
if (mysql->net.pvio) free_old_query(mysql);
{ mysql->status=MYSQL_STATUS_READY; /* Force command */
free_old_query(mysql); mysql->options.reconnect=0;
mysql->status=MYSQL_STATUS_READY; /* Force command */ if (mysql->net.pvio && mysql->net.buff)
mysql->options.reconnect=0; ma_simple_command(mysql, COM_QUIT,NullS,0,1,0);
if (mysql->net.pvio && mysql->net.buff) end_server(mysql);
ma_simple_command(mysql, COM_QUIT,NullS,0,1,0);
end_server(mysql);
}
/* there is an ongoing async operation */ /* there is an ongoing async operation */
else if (mysql->options.extension && mysql->options.extension->async_context) if (mysql->options.extension && mysql->options.extension->async_context)
{ {
if (mysql->options.extension->async_context->pending_gai_res) if (mysql->options.extension->async_context->pending_gai_res)
{ {

5
unittest/libmariadb/connection.c
View File

@@ -2410,7 +2410,8 @@ int test_tls_timeout(MYSQL *unused __attribute__((unused)))
} }
#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) #if defined(HAVE_GNUTLS) && GNUTLS_VERSION_NUMBER >= 0x030700 || defined(HAVE_OPENSSL)
#define HAVE_test_conc748
static int test_conc748(MYSQL *my __attribute__((unused))) static int test_conc748(MYSQL *my __attribute__((unused)))
{ {
MYSQL *mysql; MYSQL *mysql;
@@ -2496,7 +2497,7 @@ struct my_tests_st my_tests[] = {
{"test_conc589", test_conc589, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {"test_conc589", test_conc589, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_tls_timeout", test_tls_timeout, TEST_CONNECTION_NONE, 0, NULL, NULL}, {"test_tls_timeout", test_tls_timeout, TEST_CONNECTION_NONE, 0, NULL, NULL},
{"test_parsec", test_parsec, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {"test_parsec", test_parsec, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) #ifdef HAVE_test_conc748
{"test_conc748", test_conc748, TEST_CONNECTION_NONE, 0, NULL, NULL}, {"test_conc748", test_conc748, TEST_CONNECTION_NONE, 0, NULL, NULL},
#endif #endif
{"test_conc505", test_conc505, TEST_CONNECTION_NONE, 0, NULL, NULL}, {"test_conc505", test_conc505, TEST_CONNECTION_NONE, 0, NULL, NULL},