← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_key.c

  • Committer: Monty Taylor
  • Date: 2008-07-16 19:10:24 UTC
  • mfrom: (51.1.127 remove-dbug)
  • mto: This revision was merged to the branch mainline in revision 176.
  • Revision ID: monty@inaugust.com-20080716191024-prjgoh7fbri7rx26
Merged from remove-dbug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_key.c
54
54
  uchar *start;
55
55
  register HA_KEYSEG *keyseg;
56
56
  my_bool is_ft= info->s->keyinfo[keynr].flag & HA_FULLTEXT;
57
 
  DBUG_ENTER("_mi_make_key");
58
57
 
59
58
  start=key;
60
59
  for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type ;keyseg++)
175
174
    key+= length;
176
175
  }
177
176
  _mi_dpointer(info,key,filepos);
178
 
  DBUG_PRINT("exit",("keynr: %d",keynr));
179
 
  DBUG_DUMP("key",(uchar*) start,(uint) (key-start)+keyseg->length);
180
 
  DBUG_EXECUTE("key",
181
 
               _mi_print_key(DBUG_FILE,info->s->keyinfo[keynr].seg,start,
182
 
                             (uint) (key-start)););
183
 
  DBUG_RETURN((uint) (key-start));              /* Return keylength */
 
177
  return((uint) (key-start));           /* Return keylength */
184
178
} /* _mi_make_key */
185
179
 
186
180
 
208
202
  uchar *start_key=key;
209
203
  HA_KEYSEG *keyseg;
210
204
  my_bool is_ft= info->s->keyinfo[keynr].flag & HA_FULLTEXT;
211
 
  DBUG_ENTER("_mi_pack_key");
212
205
 
213
206
  /* only key prefixes are supported */
214
 
  DBUG_ASSERT(((keypart_map+1) & keypart_map) == 0);
 
207
  assert(((keypart_map+1) & keypart_map) == 0);
215
208
 
216
209
  for (keyseg= info->s->keyinfo[keynr].seg ; keyseg->type && keypart_map;
217
210
       old+= keyseg->length, keyseg++)
282
275
  if (last_used_keyseg)
283
276
    *last_used_keyseg= keyseg;
284
277
 
285
 
  DBUG_RETURN((uint) (key-start_key));
 
278
  return((uint) (key-start_key));
286
279
} /* _mi_pack_key */
287
280
 
288
281
 
313
306
  uchar *pos,*key_end;
314
307
  register HA_KEYSEG *keyseg;
315
308
  uchar *blob_ptr;
316
 
  DBUG_ENTER("_mi_put_key_in_record");
317
309
 
318
310
  blob_ptr= (uchar*) info->lastkey2;             /* Place to put blob parts */
319
311
  key=(uchar*) info->lastkey;                    /* KEy that was read */
437
429
      key+= keyseg->length;
438
430
    }
439
431
  }
440
 
  DBUG_RETURN(0);
 
432
  return(0);
441
433
 
442
434
err:
443
 
  DBUG_RETURN(1);                               /* Crashed row */
 
435
  return(1);                            /* Crashed row */
444
436
} /* _mi_put_key_in_record */
445
437
 
446
438
 
565
557
    value= uint8korr(key);
566
558
    break;
567
559
  default:
568
 
    DBUG_ASSERT(0);
 
560
    assert(0);
569
561
    value=0;                                    /* Error */
570
562
    break;
571
563
  }