summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/protocol.cc3
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;