← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/type_holder.cc

  • Committer: Brian Aker
  • Date: 2011-02-11 09:39:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2160.
  • Revision ID: brian@tangent.org-20110211093917-qfdydch1fzskruf8
Fix for union.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/type_holder.cc
207
207
 
208
208
  switch (item->field_type())
209
209
  {
 
210
  case DRIZZLE_TYPE_TIME:
 
211
  case DRIZZLE_TYPE_BOOLEAN:
 
212
  case DRIZZLE_TYPE_UUID:
 
213
  case DRIZZLE_TYPE_MICROTIME:
210
214
  case DRIZZLE_TYPE_TIMESTAMP:
211
215
  case DRIZZLE_TYPE_DATETIME:
212
216
  case DRIZZLE_TYPE_DATE:
214
218
  case DRIZZLE_TYPE_DECIMAL:
215
219
  case DRIZZLE_TYPE_ENUM:
216
220
  case DRIZZLE_TYPE_BLOB:
217
 
    return 4;
 
221
    return item->max_length;
218
222
  case DRIZZLE_TYPE_LONG:
219
223
    return MY_INT32_NUM_DECIMAL_DIGITS;
220
224
  case DRIZZLE_TYPE_DOUBLE:
223
227
    return 0;
224
228
  case DRIZZLE_TYPE_LONGLONG:
225
229
    return 20;
226
 
  default:
227
 
    assert(0); // we should never go there
228
 
    return 0;
229
230
  }
 
231
  assert(0);
 
232
  abort();
230
233
}
231
234
 
232
235