← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/indexes.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-04 08:13:04 UTC
  • mfrom: (2384 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110804081304-rlejjpvoos17bjdf
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/indexes.cc
114
114
  push(static_cast<uint64_t>(index.key_length()));
115
115
 
116
116
  /* INDEX_TYPE */
117
 
  {
118
 
    const char *str;
119
 
    uint32_t length;
120
 
 
121
 
    switch (index.type())
122
 
    {
123
 
    default:
124
 
    case message::Table::Index::UNKNOWN_INDEX:
125
 
      str= "UNKNOWN";
126
 
      length= sizeof("UNKNOWN");
127
 
      break;
128
 
    case message::Table::Index::BTREE:
129
 
      str= "BTREE";
130
 
      length= sizeof("BTREE");
131
 
      break;
132
 
    case message::Table::Index::RTREE:
133
 
      str= "RTREE";
134
 
      length= sizeof("RTREE");
135
 
      break;
136
 
    case message::Table::Index::HASH:
137
 
      str= "HASH";
138
 
      length= sizeof("HASH");
139
 
      break;
140
 
    case message::Table::Index::FULLTEXT:
141
 
      str= "FULLTEXT";
142
 
      length= sizeof("FULLTEXT");
143
 
      break;
144
 
    }
145
 
    /* Subtract 1 here, because sizeof gives us the wrong amount */
146
 
    push(str, length - 1);
147
 
  }
 
117
  push(message::type(index.type()));
148
118
 
149
119
 /* "INDEX_COMMENT" */
150
120
  if (index.has_comment())