← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: lbieber
  • Date: 2010-09-23 15:49:15 UTC
  • mfrom: (1788.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100923154915-mshh9pwln0igdwrn
Merge Brian - Rollup patch of enum + style on varchar. This modifies enum to always being the same value.
Merge Stewart - Fix embedded_innodb plugin now that TIMESTAMP is 8 bytes. 
Merge Shrews - fix bug 643630 -  Transaction_reader not handling CHAR values that include quotes properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
889
889
  switch (type) {
890
890
  case DRIZZLE_TYPE_VARCHAR: return (length + (length < 256 ? 1: 2));
891
891
  case DRIZZLE_TYPE_DATE:
 
892
  case DRIZZLE_TYPE_ENUM:
892
893
  case DRIZZLE_TYPE_LONG: return 4;
893
894
  case DRIZZLE_TYPE_DOUBLE: return sizeof(double);
894
895
  case DRIZZLE_TYPE_DATETIME:
896
897
  case DRIZZLE_TYPE_LONGLONG: return 8; /* Don't crash if no int64_t */
897
898
  case DRIZZLE_TYPE_NULL: return 0;
898
899
  case DRIZZLE_TYPE_BLOB: return 4 + portable_sizeof_char_ptr;
899
 
  case DRIZZLE_TYPE_ENUM:
900
900
  case DRIZZLE_TYPE_DECIMAL:
901
901
    abort();
902
902
  default: