database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-4.1

Browse Source 
into  mysql.com:/home/hf/work/mysql-4.1-mrg
This commit is contained in:
holyfoot/hf@mysql.com/deer.(none)
2006-11-16 20:44:37 +04:00
parent a6801d4fe4 e347eb1995
commit db5db841a9
26 changed files with 315 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql-common/client.c
View File

@@ -1173,6 +1173,8 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
for (row=data->data; row ; row = row->next,field++)
{
uchar *pos;
/* fields count may be wrong */
DBUG_ASSERT ((field - result) < fields);
cli_fetch_lengths(&lengths[0], row->data, default_value ? 8 : 7);
field->catalog = strdup_root(alloc,(char*) row->data[0]);
field->db = strdup_root(alloc,(char*) row->data[1]);