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

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-05-03 10:59:54 +02:00
parent 182b8a29e7 70555454b4
commit 9614fde1aa
111 changed files with 2663 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/mysql_client_test.c
View File

@@ -20145,6 +20145,7 @@ static void test_proxy_header_tcp(const char *ipaddr, int port)
// normalize IPv4-mapped IPv6 addresses, e.g ::ffff:127.0.0.2 to 127.0.0.2
const char *normalized_addr= strncmp(ipaddr, "::ffff:", 7)?ipaddr : ipaddr + 7;
myheader("test_proxy_header_tcp");
memset(&v2_header, 0, sizeof(v2_header));
sprintf(text_header,"PROXY %s %s %s %d 3306\r\n",family == AF_INET?"TCP4":"TCP6", ipaddr, ipaddr, port);
@@ -20223,6 +20224,7 @@ static void test_proxy_header_localhost()
MYSQL_RES *result;
MYSQL_ROW row;
int rc;
myheader("test_proxy_header_localhost");
memset(&v2_header, 0, sizeof(v2_header));
memcpy(v2_header.sig, "\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A", 12);
@@ -20255,6 +20257,7 @@ static void test_proxy_header_ignore()
int rc;
MYSQL *m = mysql_client_init(NULL);
v2_proxy_header v2_header;
myheader("test_ps_params_in_ctes");
DIE_UNLESS(m != NULL);
mysql_optionsv(m, MARIADB_OPT_PROXY_HEADER, "PROXY UNKNOWN\r\n",15);
DIE_UNLESS(mysql_real_connect(m, opt_host, "root", "", NULL, opt_port, opt_unix_socket, 0) == m);
@@ -20285,6 +20288,7 @@ static void test_proxy_header_ignore()
static void test_proxy_header()
{
myheader("test_proxy_header");
test_proxy_header_tcp("192.0.2.1",3333);
test_proxy_header_tcp("2001:db8:85a3::8a2e:370:7334",2222);
test_proxy_header_tcp("::ffff:192.0.2.1",2222);
@@ -20304,6 +20308,7 @@ static void test_bulk_autoinc()
int i, id[]= {2, 3, 777}, count= sizeof(id)/sizeof(id[0]);
MYSQL_RES *result;
myheader("test_bulk_autoinc");
rc= mysql_query(mysql, "DROP TABLE IF EXISTS ai_field_value");
myquery(rc);
rc= mysql_query(mysql, "CREATE TABLE ai_field_value (id int not null primary key auto_increment)");
@@ -20357,6 +20362,7 @@ static void test_bulk_delete()
int i, id[]= {1, 2, 4}, count= sizeof(id)/sizeof(id[0]);
MYSQL_RES *result;
myheader("test_bulk_delete");
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
myquery(rc);
rc= mysql_query(mysql, "CREATE TABLE t1 (id int not null primary key)");
@@ -20419,6 +20425,7 @@ static void test_bulk_replace()
count= sizeof(id)/sizeof(id[0]);
MYSQL_RES *result;
myheader("test_bulk_replace");
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
myquery(rc);
rc= mysql_query(mysql, "CREATE TABLE t1 (id int not null primary key, active int)");
@@ -20477,6 +20484,7 @@ static void test_ps_params_in_ctes()
int int_data[1];
MYSQL_STMT *stmt;
myheader("test_ps_params_in_ctes");
rc= mysql_query(mysql, "create table t1(a int, b int, key(a))");
myquery(rc);