database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-01 06:27:04 +03:00
Code Activity

Merge branch '3.1' into 3.3

Browse Source
This commit is contained in:
Georg Richter
2025-01-15 08:00:19 +01:00
parent 75d381ffb2 732a1ad194
commit 57ce0ce3c7
5 changed files with 108 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
libmariadb/mariadb_lib.c
View File

@ -399,6 +399,15 @@ mthd_my_send_cmd(MYSQL *mysql,enum enum_server_command command, const char *arg,
{
NET *net= &mysql->net;
int result= -1;
/* CONC-589: If reconnect option was specified, we have to check if the connection
(socket) is still available */
if (command != COM_QUIT && mysql->options.reconnect && ma_pvio_is_alive(mysql->net.pvio))
{
mysql->net.pvio= NULL;
mysql->net.error= 1;
}
if (mysql->net.pvio == 0)
{
/* Do reconnect if possible */
@ -1044,6 +1053,35 @@ static size_t rset_field_offsets[]= {
OFFSET(MYSQL_FIELD, org_name_length)
};
/* calculate lengths for field metadata:
returns zero on success, 1 if null_length was
detected */
static my_bool ma_get_rset_field_lengths(MYSQL_ROW row, unsigned int field_count,
unsigned long *lengths)
{
unsigned long *last_length= 0;
char *pos= 0;
MYSQL_ROW end= row + field_count + 1;
my_bool rc= 0;
while (row != end)
{
if (*row)
{
if (pos)
*last_length= (ulong)(*row - pos - 1);
pos= *row;
} else {
/* NULL_LENGTH (see also CONC-709) */
rc= 1;
*last_length= 0;
}
last_length= lengths++;
row++;
}
return rc;
}
MYSQL_FIELD *
unpack_fields(const MYSQL *mysql,
MYSQL_DATA *data, MA_MEM_ROOT *alloc, uint fields,
@ -1060,21 +1098,19 @@ unpack_fields(const MYSQL *mysql,
for (row=data->data; row ; row = row->next,field++)
{
unsigned long lengths[9];
if (field >= result + fields)
goto error;
if (ma_get_rset_field_lengths(row->data, field_count, lengths))
goto error;
for (i=0; i < field_count; i++)
{
uint length;
if (!row->data[i])
goto error;
length= (uint)(row->data[i+1] - row->data[i] - 1);
*(char **)(((char *)field) + rset_field_offsets[i*2])=
ma_strdup_root(alloc, (char *)row->data[i]);
*(unsigned int *)(((char *)field) + rset_field_offsets[i*2+1])= length;
*(unsigned int *)(((char *)field) + rset_field_offsets[i*2+1])= lengths[i];
}
field->extension= NULL;