1
0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00

Merge branch '3.1' into 3.2

This commit is contained in:
Georg Richter
2021-07-28 06:06:11 +02:00

View File

@@ -5124,6 +5124,7 @@ static int test_conc565(MYSQL *mysql)
MYSQL_FIELD *fields_binary, *fields_text; MYSQL_FIELD *fields_binary, *fields_text;
MYSQL_RES *result; MYSQL_RES *result;
int rc; int rc;
unsigned int i;
my_bool x=1; my_bool x=1;
my_bool error= 0; my_bool error= 0;
@@ -5149,7 +5150,7 @@ static int test_conc565(MYSQL *mysql)
result= mysql_store_result(mysql); result= mysql_store_result(mysql);
fields_text= mysql_fetch_fields(result); fields_text= mysql_fetch_fields(result);
for (unsigned int i=0; i < mysql_field_count(mysql); i++) for (i=0; i < mysql_field_count(mysql); i++)
{ {
if (fields_binary[i].length != fields_text[i].length || if (fields_binary[i].length != fields_text[i].length ||
fields_binary[i].max_length != fields_text[i].max_length) fields_binary[i].max_length != fields_text[i].max_length)