← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/rpl_utility.cc

  • Committer: Brian Aker
  • Date: 2008-07-10 19:37:55 UTC
  • mfrom: (51.1.67 remove-dbug)
  • Revision ID: brian@tangent.org-20080710193755-f5g761uieqa3wxmt
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/rpl_utility.cc
57
57
        byte.
58
58
      */
59
59
      length= (uint) *master_data + 1;
60
 
      DBUG_ASSERT(length != 0);
 
60
      assert(length != 0);
61
61
    }
62
62
    break;
63
63
  }
92
92
  case MYSQL_TYPE_VARCHAR:
93
93
  {
94
94
    length= m_field_metadata[col] > 255 ? 2 : 1; // c&p of Field_varstring::data_length()
95
 
    DBUG_ASSERT(uint2korr(master_data) > 0);
 
95
    assert(uint2korr(master_data) > 0);
96
96
    length+= length == 1 ? (uint32) *master_data : uint2korr(master_data);
97
97
    break;
98
98
  }
129
129
  {
130
130
    if (table->field[col]->type() != type(col))
131
131
    {
132
 
      DBUG_ASSERT(col < size() && col < tsh->fields);
133
 
      DBUG_ASSERT(tsh->db.str && tsh->table_name.str);
 
132
      assert(col < size() && col < tsh->fields);
 
133
      assert(tsh->db.str && tsh->table_name.str);
134
134
      error= 1;
135
135
      char buf[256];
136
136
      snprintf(buf, sizeof(buf), "Column %d type mismatch - "