database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/home/hf/work/mysql-5.0-mrg

Browse Source 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
This commit is contained in:
holyfoot/hf@deer.(none)
2006-11-17 18:27:28 +04:00
parent fd810905e9 497ccd6b87
commit dd0b81885d
20 changed files with 324 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql-common/client.c
View File

@@ -1186,6 +1186,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]);