← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.cc

  • Committer: Lee Bieber
  • Date: 2011-02-16 14:48:10 UTC
  • mfrom: (2172.1.5 build)
  • Revision ID: kalebral@gmail.com-20110216144810-u3w6f3a5s6qwisrz
Merge Stewart - remove unused macros
Merge Olaf - remove old style casts
Merge Stewart remove  unused macros in drizzledump
Merge Andrew - 718657: Several errors in Date/Time docs
Merge Olaf - Move strfunc functions into TYPELIB class

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.cc
25
25
#include "drizzled/table.h"
26
26
#include "drizzled/session.h"
27
27
#include "drizzled/strfunc.h"
 
28
#include "drizzled/typelib.h"
28
29
 
29
30
#include <sstream>
30
31
#include <string>
65
66
 
66
67
  /* Remove end space */
67
68
  length= field_charset->cset->lengthsp(field_charset, from, length);
68
 
  tmp= find_type2(typelib, from, length, field_charset);
 
69
  tmp= typelib->find_type2(from, length, field_charset);
69
70
  if (! tmp)
70
71
  {
71
72
    if (length < 6) /* Can't be more than 99999 enums */