diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-28 21:11:05 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-28 21:11:05 +0100 |
| commit | befbebcfdb0749fc0167a7652900abae6a0060e7 (patch) | |
| tree | 89185b0d10c5b8c12807ce8fcb41122c9cf5c18e /sql-common | |
| parent | e3a9d9493556d159a580d7e266770fcaf38c7343 (diff) | |
| parent | 0fb7649940c849f4df4ceca7d01f5e8946ffbb0d (diff) | |
| download | mariadb-git-befbebcfdb0749fc0167a7652900abae6a0060e7.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
client/mysqltest.c:
Auto merged
Makefile.am:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
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]); |