← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_conv.cc

  • Committer: Brian Aker
  • Date: 2011-01-06 18:00:47 UTC
  • mto: This revision was merged to the branch mainline in revision 2064.
  • Revision ID: brian@tangent.org-20110106180047-0l214nvry9x1lkxo
Merge in fixes for microtimestamp,

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_conv.cc
856
856
    return to->store(result.c_ptr_quick(),result.length(),from->charset());
857
857
  }
858
858
  else if (from->result_type() == REAL_RESULT)
859
 
  {
860
859
    return to->store(from->val_real());
861
 
  }
862
860
  else if (from->result_type() == DECIMAL_RESULT)
863
861
  {
864
862
    type::Decimal buff;
865
863
    return to->store_decimal(from->val_decimal(&buff));
866
864
  }
867
865
  else
868
 
  {
869
866
    return to->store(from->val_int(), test(from->flags & UNSIGNED_FLAG));
870
 
  }
871
867
}
872
868
 
873
869
} /* namespace drizzled */