← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/protocol.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/protocol.cc
803
803
{
804
804
#ifndef DBUG_OFF
805
805
  DBUG_ASSERT(field_types == 0 ||
806
 
              field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
807
806
              field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
808
807
              (field_types[field_pos] >= MYSQL_TYPE_ENUM && field_types[field_pos] <= MYSQL_TYPE_STRING));
809
808
  field_pos++;
818
817
  CHARSET_INFO *tocs= this->thd->variables.character_set_results;
819
818
#ifndef DBUG_OFF
820
819
  DBUG_ASSERT(field_types == 0 ||
821
 
              field_types[field_pos] == MYSQL_TYPE_DECIMAL ||
822
820
              field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL ||
823
821
              field_types[field_pos] == MYSQL_TYPE_NEWDATE ||
824
822
              (field_types[field_pos] >= MYSQL_TYPE_ENUM && field_types[field_pos] <= MYSQL_TYPE_STRING));