diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2009-02-27 10:03:47 +0200 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2009-02-27 10:03:47 +0200 |
| commit | 32a48f06a298983c93b237be9aff1fb461976554 (patch) | |
| tree | 76f9e9797f68df7453441af3a4c8fbe59595341c /sql/protocol.cc | |
| parent | d3380a9285281a5d8cb232675a5392be5cede6bb (diff) | |
| parent | 494a7641740f20eb5c42d816b527e30a2e24114c (diff) | |
| download | mariadb-git-32a48f06a298983c93b237be9aff1fb461976554.tar.gz | |
merged 5.0-bugteam -> 5.1-bugteam.
Fixed a warning in 5.1 caused by missing type cast.
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 6699196fbc7..16975c68a54 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -598,7 +598,8 @@ bool Protocol::send_fields(List<Item> *list, uint flags) field.length / item->collation.collation->mbminlen : field.length / item->collation.collation->mbmaxlen; max_length*= thd_charset->mbmaxlen; - field_length= (max_length > UINT_MAX32) ? UINT_MAX32 : max_length; + field_length= (max_length > UINT_MAX32) ? + UINT_MAX32 : (uint32) max_length; int4store(pos + 2, field_length); } pos[6]= field.type; |