summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-05-08 15:02:19 +0200
committerSergei Golubchik <serg@mariadb.org>2022-05-08 23:03:08 +0200
commita70a1cf3f4ed10c9d9194b2b8df6b6f08551a937 (patch)
tree517124ec5059f48bff1e02b934355e8162183efc /tests
parent40b8f3ec1a76fc23eb6bf9c5a8fef1debcbf5843 (diff)
parent79660e59ee8fcd23f928c72dc77682b875bd58ce (diff)
downloadmariadb-git-a70a1cf3f4ed10c9d9194b2b8df6b6f08551a937.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'tests')
-rw-r--r--tests/mysql_client_fw.c2
-rw-r--r--tests/mysql_client_test.c8
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
index 8a6d38d9e30..e8d628e7b52 100644
--- a/tests/mysql_client_fw.c
+++ b/tests/mysql_client_fw.c
@@ -101,6 +101,7 @@ DBUG_PRINT("test", ("name: %s", str)); \
fprintf(stdout, "%u of (%u/%u): %s", test_count++, iter_count, \
opt_count, str); \
fprintf(stdout, " \n#####################################\n"); \
+ fflush(stdout); \
}
#define myheader_r(str) \
@@ -110,6 +111,7 @@ DBUG_PRINT("test", ("name: %s", str)); \
fprintf(stdout, "\n\n#####################################\n"); \
fprintf(stdout, "%s", str); \
fprintf(stdout, " \n#####################################\n"); \
+ fflush(stdout); \
}
static void print_error(const char *msg);
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 48fb71dfcec..d4e4f0c84a5 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -20226,6 +20226,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);
@@ -20304,6 +20305,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);
@@ -20336,6 +20338,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);
@@ -20366,6 +20369,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);
@@ -20385,6 +20389,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)");
@@ -20438,6 +20443,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)");
@@ -20500,6 +20506,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)");
@@ -20558,6 +20565,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);