← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/blob.cc

  • Committer: Brian Aker
  • Date: 2009-02-02 23:10:18 UTC
  • mfrom: (779.3.40 devel)
  • Revision ID: brian@tangent.org-20090202231018-zlp0hka6kgwy1vfy
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/blob.cc
31
31
uint32_t
32
32
blob_pack_length_to_max_length(uint32_t arg)
33
33
{
34
 
  return (INT64_C(1) << cmin(arg, 4U) * 8) - INT64_C(1);
 
34
  return (uint32_t)cmax(UINT32_MAX,
 
35
                        (INT64_C(1) << cmin(arg, 4U) * 8) - INT64_C(1));
35
36
}
36
37
 
37
38