← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/field_conv.cc

  • Committer: Brian Aker
  • Date: 2008-07-06 15:56:24 UTC
  • Revision ID: brian@tangent.org-20080706155624-pn6a48azmjh6nalx
Most of the removal of dead DECIMAL type

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/field_conv.cc
712
712
             to_length != from_length ||
713
713
             !compatible_db_low_byte_first)
714
714
    {
715
 
      if (to->real_type() == MYSQL_TYPE_DECIMAL ||
716
 
          to->result_type() == STRING_RESULT)
 
715
      if (to->result_type() == STRING_RESULT)
717
716
        return do_field_string;
718
717
      if (to->result_type() == INT_RESULT)
719
718
        return do_field_int;
723
722
    {
724
723
      if (!to->eq_def(from) || !compatible_db_low_byte_first)
725
724
      {
726
 
        if (to->real_type() == MYSQL_TYPE_DECIMAL)
727
 
          return do_field_string;
728
725
        if (to->result_type() == INT_RESULT)
729
726
          return do_field_int;
730
727
        else
796
793
  else if ((from->result_type() == STRING_RESULT &&
797
794
            (to->result_type() == STRING_RESULT ||
798
795
             (from->real_type() != MYSQL_TYPE_ENUM &&
799
 
              from->real_type() != MYSQL_TYPE_SET))) ||
800
 
           to->type() == MYSQL_TYPE_DECIMAL)
 
796
              from->real_type() != MYSQL_TYPE_SET))))
801
797
  {
802
798
    char buff[MAX_FIELD_WIDTH];
803
799
    String result(buff,sizeof(buff),from->charset());