database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge from 10.4 to 10.5

Browse Source 
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2024-04-15 17:46:24 +02:00
parent 10272f3709 bf49e7cfc7
commit 16aa4b5f59
58 changed files with 1009 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/mysql_client_test.c
View File

@@ -20561,7 +20561,6 @@ typedef struct {
#ifndef EMBEDDED_LIBRARY
static void test_proxy_header_tcp(const char *ipaddr, int port)
{
int rc;
MYSQL_RES *result;
int family = (strchr(ipaddr,':') == NULL)?AF_INET:AF_INET6;
@@ -20636,6 +20635,11 @@ static void test_proxy_header_tcp(const char *ipaddr, int port)
DIE_UNLESS(strncmp(row[0], normalized_addr, addrlen) == 0);
DIE_UNLESS(atoi(row[0] + addrlen+1) == port);
mysql_free_result(result);
if (i == 0 && !strcmp(ipaddr,"192.0.2.1"))
{
/* do "dirty" close, to get aborted message in error log.*/
mariadb_cancel(m);
}
mysql_close(m);
}
sprintf(query,"DROP USER 'u'@'%s'",normalized_addr);