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:
Georg Richter
2025-02-27 11:09:55 +01:00
parent 13c693f28b 0ff64ca045
commit 605f30f754
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unittest/libmariadb/connection.c
View File

@@ -2504,6 +2504,7 @@ static int test_conc760(MYSQL *my)
MYSQL_RES *result; MYSQL_RES *result;
MYSQL_ROW row; MYSQL_ROW row;
int rc; int rc;
char named_pipe_name[128];
my_bool reconnect= 1, verify= 0; my_bool reconnect= 1, verify= 0;
unsigned long last_thread_id= 0; unsigned long last_thread_id= 0;
unsigned int protocol= MYSQL_PROTOCOL_PIPE; unsigned int protocol= MYSQL_PROTOCOL_PIPE;
@@ -2511,13 +2512,15 @@ static int test_conc760(MYSQL *my)
SKIP_MAXSCALE; SKIP_MAXSCALE;
rc= mysql_query(my, "select @@named_pipe"); rc= mysql_query(my, "select @@named_pipe, @@socket");
check_mysql_rc(rc, mysql); check_mysql_rc(rc, mysql);
if ((result= mysql_store_result(my))) if ((result= mysql_store_result(my)))
{ {
if((row= mysql_fetch_row(result))) if((row= mysql_fetch_row(result)))
have_named_pipe= atoi(row[0]); have_named_pipe= atoi(row[0]);
strncpy(named_pipe_name, row[1], sizeof(named_pipe_name)-1);
named_pipe_name[sizeof(named_pipe_name)-1]= '\0';
mysql_free_result(result); mysql_free_result(result);
} }
@@ -2532,7 +2535,7 @@ static int test_conc760(MYSQL *my)
mysql_options(mysql, MYSQL_OPT_PROTOCOL, &protocol); mysql_options(mysql, MYSQL_OPT_PROTOCOL, &protocol);
if (!my_test_connect(mysql, hostname, username, if (!my_test_connect(mysql, hostname, username,
password, schema, port, socketname, CLIENT_REMEMBER_OPTIONS)) password, schema, port, named_pipe_name, CLIENT_REMEMBER_OPTIONS))
{ {
diag("error: %s", mysql_error(mysql)); diag("error: %s", mysql_error(mysql));
return FAIL; return FAIL;