← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.cc

  • Committer: Brian Aker
  • Date: 2010-10-10 02:00:34 UTC
  • mfrom: (1830.1.5 trunk-drizzle)
  • Revision ID: brian@tangent.org-20101010020034-d67x3d09fssxq1v6
Merge rollup of utf8 and table encapsulation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.cc
2130
2130
  int colnr= 0;
2131
2131
 
2132
2132
  /* We need the primary key for ::position() to work */
2133
 
  if (table->s->getPrimaryKey() != MAX_KEY)
2134
 
    table->mark_columns_used_by_index_no_reset(table->s->getPrimaryKey());
 
2133
  if (table->getShare()->getPrimaryKey() != MAX_KEY)
 
2134
    table->mark_columns_used_by_index_no_reset(table->getShare()->getPrimaryKey());
2135
2135
 
2136
2136
  for (Field **field= table->getFields() ; *field ; field++, colnr++)
2137
2137
  {
2576
2576
  /* works only with key prefixes */
2577
2577
  assert(((keypart_map_arg + 1) & keypart_map_arg) == 0);
2578
2578
 
2579
 
  KeyPartInfo *key_part_found= table->s->getKeyInfo(key_position).key_part;
2580
 
  KeyPartInfo *end_key_part_found= key_part_found + table->s->getKeyInfo(key_position).key_parts;
 
2579
  KeyPartInfo *key_part_found= table->getShare()->getKeyInfo(key_position).key_part;
 
2580
  KeyPartInfo *end_key_part_found= key_part_found + table->getShare()->getKeyInfo(key_position).key_parts;
2581
2581
  uint32_t length= 0;
2582
2582
 
2583
2583
  while (key_part_found < end_key_part_found && keypart_map_arg)