← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Brian Aker
  • Date: 2010-05-29 06:06:10 UTC
  • mfrom: (1574.1.8 new-staging)
  • Revision ID: brian@gir-20100529060610-phsss4stvg0uub22
Merge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
212
212
  uint32_t i, j, recpos, minpos, fieldpos, temp_length, length;
213
213
  enum ha_base_keytype type= HA_KEYTYPE_BINARY;
214
214
  unsigned char *record;
215
 
  KeyInfo *pos;
216
215
  MI_KEYDEF *keydef;
217
216
  MI_COLUMNDEF *recinfo, *recinfo_pos;
218
217
  HA_KEYSEG *keyseg;
226
225
    return(HA_ERR_OUT_OF_MEM);
227
226
  keydef= *keydef_out;
228
227
  recinfo= *recinfo_out;
229
 
  pos= table_arg->key_info;
230
 
  for (i= 0; i < share->keys; i++, pos++)
 
228
  for (i= 0; i < share->keys; i++)
231
229
  {
 
230
    KeyInfo *pos= &table_arg->key_info[i];
232
231
    keydef[i].flag= ((uint16_t) pos->flags & (HA_NOSAME));
233
232
    keydef[i].key_alg= HA_KEY_ALG_BTREE;
234
233
    keydef[i].block_length= pos->block_size;
1443
1442
 
1444
1443
  (void) extra(HA_EXTRA_KEYREAD);
1445
1444
  key_copy(key, table->record[0],
1446
 
           table->key_info + table->getShare()->next_number_index,
 
1445
           &table->key_info[table->getShare()->next_number_index],
1447
1446
           table->getShare()->next_number_key_offset);
1448
1447
  error= mi_rkey(file, table->record[1], (int) table->getShare()->next_number_index,
1449
1448
                 key, make_prev_keypart_map(table->getShare()->next_number_keypart),