← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/embedded_innodb/embedded_innodb_engine.cc

  • Committer: Stewart Smith
  • Date: 2010-06-04 02:51:04 UTC
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: stewart@flamingspork.com-20100604025104-ilf5mrvwbpd5crzv
https://launchpad.net/bugs/579310
have a constant for the maximum number of enum elements

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/embedded_innodb/embedded_innodb_engine.cc
99
99
#include <drizzled/field.h>
100
100
#include "drizzled/field/timestamp.h" // needed for UPDATE NOW()
101
101
#include "drizzled/field/blob.h"
 
102
#include "drizzled/field/enum.h"
102
103
#include <drizzled/session.h>
103
104
 
104
105
using namespace std;
681
682
                                    column_attr, 0, 2);
682
683
    else
683
684
    {
684
 
      assert(field_options.field_value_size() < (int)0x10000);
 
685
      assert(field_options.field_value_size() <= Field_enum::max_supported_elements);
685
686
    }
686
687
    break;
687
688
  }