← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/embedded_innodb/embedded_innodb_engine.cc

  • Committer: Brian Aker
  • Date: 2010-05-28 20:57:41 UTC
  • mto: (1377.8.17 unittests)
  • mto: This revision was merged to the branch mainline in revision 1578.
  • Revision ID: brian@gaz-20100528205741-1rs940n3t015j5pq
Encapsulate Key info in share.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/embedded_innodb/embedded_innodb_engine.cc
2009
2009
    ib_err_t err;
2010
2010
    ib_id_t index_id;
2011
2011
    err= ib_index_get_id(table_share->getPath()+2,
2012
 
                         table_share->key_info[keynr].name,
 
2012
                         table_share->getKeyInfo(keynr).name,
2013
2013
                         &index_id);
2014
2014
    if (err != DB_SUCCESS)
2015
2015
      return -1;
2196
2196
  /* works only with key prefixes */
2197
2197
  assert(((keypart_map_arg + 1) & keypart_map_arg) == 0);
2198
2198
 
2199
 
  KeyInfo *key_info_found= table->s->key_info + key_position;
2200
 
  KeyPartInfo *key_part_found= key_info_found->key_part;
2201
 
  KeyPartInfo *end_key_part_found= key_part_found + key_info_found->key_parts;
 
2199
  KeyPartInfo *key_part_found= table->s->getKeyInfo(key_position).key_part;
 
2200
  KeyPartInfo *end_key_part_found= key_part_found + table->s->getKeyInfo(key_position).key_parts;
2202
2201
  uint32_t length= 0;
2203
2202
 
2204
2203
  while (key_part_found < end_key_part_found && keypart_map_arg)