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.3

This commit is contained in:
Georg Richter
2023-03-30 13:36:29 +02:00

View File

@@ -2975,12 +2975,16 @@ mysql_use_result(MYSQL *mysql)
}
if (!(result=(MYSQL_RES*) calloc(1, sizeof(*result)+
sizeof(ulong)*mysql->field_count)))
{
SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0);
return(0);
}
result->lengths=(ulong*) (result+1);
if (!(result->row=(MYSQL_ROW)
malloc(sizeof(result->row[0])*(mysql->field_count+1))))
{ /* Ptrs: to one row */
free(result);
SET_CLIENT_ERROR(mysql, CR_OUT_OF_MEMORY, SQLSTATE_UNKNOWN, 0);
return(0);
}
result->fields= mysql->fields;