mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge
client/mysql.cc: Auto merged libmysql/libmysql.c: I commited this change 2 weeks ago. I am still waiting for approval to push. Someone meanwhile pushed different commit, so this merge commit.
This commit is contained in:
@ -1200,9 +1200,12 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
|
||||
field->flags|= NUM_FLAG;
|
||||
if (default_value && row->data[6])
|
||||
{
|
||||
field->def=strdup_root(alloc,(char*) row->data[8]);
|
||||
field->def=strdup_root(alloc,(char*) row->data[6]);
|
||||
field->def_length= lengths[6];
|
||||
}
|
||||
else
|
||||
field->def=0;
|
||||
field->max_length= 0;
|
||||
}
|
||||
}
|
||||
#ifndef DELETE_SUPPORT_OF_4_0_PROTOCOL
|
||||
|
Reference in New Issue
Block a user