diff options
| author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-11-13 12:44:56 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-11-13 12:44:56 +0200 |
| commit | 92a3ed719ef24d76164e40d83e53b8225ef654e6 (patch) | |
| tree | d655ba70b966d4f0479e28a8f3ba2e0a0fd3005f /sql-common | |
| parent | a5975941a43885579b86e511248d2dde1cebdb3d (diff) | |
| parent | f53af7b8e5a8913af0625031304eb824b6330e4b (diff) | |
| download | mariadb-git-92a3ed719ef24d76164e40d83e53b8225ef654e6.tar.gz | |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B19216-4.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B19216-5.0-opt
sql/protocol.h:
Auto merged
sql-common/client.c:
Auto merged
BitKeeper/deleted/.del-mysql_client.test:
merge 4.1->5.0
sql/protocol.cc:
merge 4.1->5.0
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 cfd53fb1012..d2b292557e8 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1191,6 +1191,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]); |