← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/num1.cc

  • Committer: David Shrewsbury
  • Date: 2010-10-11 17:20:14 UTC
  • mfrom: (1838 trunk-drizzle)
  • mto: (1838.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1839.
  • Revision ID: shrewsbury.dave@gmail.com-20101011172014-sij1m2doi2fl2duo
Merge from trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/num1.cc
38
38
  case INT_RESULT:
39
39
    unsigned_flag= args[0]->unsigned_flag;
40
40
    break;
41
 
 
42
41
  case STRING_RESULT:
43
42
  case REAL_RESULT:
44
43
    hybrid_type= REAL_RESULT;
45
44
    max_length= float_length(decimals);
46
45
    break;
47
 
 
48
46
  case DECIMAL_RESULT:
49
47
    break;
50
 
 
51
 
  case ROW_RESULT:
 
48
  default:
52
49
    assert(0);
53
50
  }
 
51
  return;
54
52
}
55
53
 
56
54
void Item_func_num1::fix_num_length_and_dec()