← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.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/table_share.cc
1075
1075
      {
1076
1076
        message::Table::Field::EnumerationValues field_options= pfield.enumeration_values();
1077
1077
 
1078
 
        field_pack_length[fieldnr]=
1079
 
          get_enum_pack_length(field_options.field_value_size());
 
1078
        field_pack_length[fieldnr]= 4;
1080
1079
 
1081
1080
        interval_count++;
1082
1081
        interval_parts+= field_options.field_value_size();
2121
2120
                                 null_pos,
2122
2121
                                 null_bit,
2123
2122
                                 field_name,
2124
 
                                 get_enum_pack_length(interval->count),
2125
2123
                                 interval,
2126
2124
                                 field_charset);
2127
2125
  case DRIZZLE_TYPE_VARCHAR: