← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/protocol.cc

  • Committer: Brian Aker
  • Date: 2008-07-05 23:53:02 UTC
  • Revision ID: brian@tangent.org-20080705235302-aablzbkl1cvuao1x
Removal of GEOM type

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/protocol.cc
805
805
  DBUG_ASSERT(field_types == 0 ||
806
806
              field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
807
807
              field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
808
 
              (field_types[field_pos] >= MYSQL_TYPE_ENUM &&
809
 
               field_types[field_pos] <= MYSQL_TYPE_GEOMETRY));
 
808
              (field_types[field_pos] >= MYSQL_TYPE_ENUM && field_types[field_pos] <= MYSQL_TYPE_STRING));
810
809
  field_pos++;
811
810
#endif
812
811
  return store_string_aux(from, length, fromcs, tocs);
822
821
              field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
823
822
              field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
824
823
              field_types[field_pos] == MYSQL_TYPE_NEWDATE ||
825
 
              (field_types[field_pos] >= MYSQL_TYPE_ENUM &&
826
 
               field_types[field_pos] <= MYSQL_TYPE_GEOMETRY));
 
824
              (field_types[field_pos] >= MYSQL_TYPE_ENUM && field_types[field_pos] <= MYSQL_TYPE_STRING));
827
825
  field_pos++;
828
826
#endif
829
827
  return store_string_aux(from, length, fromcs, tocs);