mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Added missing SSL library (Should be in source distribution)
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler) Added a lot of 'version_xxx' strings to 'show variables' Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) Fixed problem with printing sub selects to debug log
This commit is contained in:
@ -96,23 +96,23 @@ bool Protocol_cursor::write()
|
||||
MYSQL_FIELD *cur_field= fields;
|
||||
MYSQL_FIELD *fields_end= fields + field_count;
|
||||
MYSQL_ROWS *new_record;
|
||||
byte **data;
|
||||
byte **data_tmp;
|
||||
byte *to;
|
||||
|
||||
new_record= (MYSQL_ROWS *)alloc_root(alloc,
|
||||
sizeof(MYSQL_ROWS) + (field_count + 1)*sizeof(char *) + packet->length());
|
||||
if (!new_record)
|
||||
goto err;
|
||||
data= (byte **)(new_record + 1);
|
||||
new_record->data= (char **)data;
|
||||
data_tmp= (byte **)(new_record + 1);
|
||||
new_record->data= (char **)data_tmp;
|
||||
|
||||
to= (byte *)(fields + field_count + 1);
|
||||
|
||||
for (; cur_field < fields_end; ++cur_field, ++data)
|
||||
for (; cur_field < fields_end; ++cur_field, ++data_tmp)
|
||||
{
|
||||
if ((len=net_field_length((uchar **)&cp)))
|
||||
{
|
||||
*data= 0;
|
||||
*data_tmp= 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user