← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_timefunc.cc

  • Committer: Brian Aker
  • Date: 2008-08-10 17:18:41 UTC
  • mfrom: (287.3.13 codestyle)
  • Revision ID: brian@tangent.org-20080810171841-pkvi2ky94wbd0nt5
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_timefunc.cc
589
589
err:
590
590
  {
591
591
    char buff[128];
592
 
    strmake(buff, val_begin, min(length, sizeof(buff)-1));
 
592
    strmake(buff, val_begin, min(length, (uint)sizeof(buff)-1));
593
593
    push_warning_printf(current_thd, DRIZZLE_ERROR::WARN_LEVEL_ERROR,
594
594
                        ER_WRONG_VALUE_FOR_TYPE, ER(ER_WRONG_VALUE_FOR_TYPE),
595
595
                        date_time_type, buff, "str_to_date");
1774
1774
  else
1775
1775
  {
1776
1776
    fixed_length=0;
1777
 
    max_length=min(arg1->max_length, MAX_BLOB_WIDTH) * 10 *
 
1777
    max_length=min(arg1->max_length,(uint32_t) MAX_BLOB_WIDTH) * 10 *
1778
1778
                   collation.collation->mbmaxlen;
1779
1779
    set_if_smaller(max_length,MAX_BLOB_WIDTH);
1780
1780
  }