← Back to branch summary

~vjsamuel/drizzle/fix-bug-651256

« back to all changes in this revision

Viewing changes to plugin/embedded_innodb/embedded_innodb_engine.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:
plugin/embedded_innodb/embedded_innodb_engine.cc
851
851
    break;
852
852
  }
853
853
  case message::Table::Field::DATE:
 
854
    *err= ib_table_schema_add_col(schema, field.name().c_str(), IB_INT,
 
855
                                  column_attr, 0, 4);
 
856
    break;
854
857
  case message::Table::Field::TIMESTAMP:
855
858
    *err= ib_table_schema_add_col(schema, field.name().c_str(), IB_INT,
856
 
                                  column_attr, 0, 4);
 
859
                                  column_attr, 0, 8);
857
860
    break;
858
861
  case message::Table::Field::BLOB:
859
862
    *err= ib_table_schema_add_col(schema, field.name().c_str(), IB_BLOB,