diff options
| author | holyfoot/hf@mysql.com/deer.(none) <> | 2006-11-16 20:44:37 +0400 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/deer.(none) <> | 2006-11-16 20:44:37 +0400 |
| commit | db5db841a9932ce883213273d05ee965ed40ffa2 (patch) | |
| tree | e36aca98ec6cb0808339df3b316090de3d48301a /sql-common | |
| parent | a6801d4fe44b8471c7f1c51f6a9e7945a533716b (diff) | |
| parent | e347eb19954b342d1a4f724cb5f91788f20bc60c (diff) | |
| download | mariadb-git-db5db841a9932ce883213273d05ee965ed40ffa2.tar.gz | |
Merge bk@192.168.21.1:mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1-mrg
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 3acd763c054..87e22624dd9 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -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]); |