~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key.cc

  • Committer: Brian Aker
  • Date: 2009-04-13 16:22:40 UTC
  • mfrom: (971.1.78 mordred)
  • Revision ID: brian@gaz-20090413162240-ugi3gvhofmcuglzl
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
#include "drizzled/field/blob.h"
23
23
 
24
24
#include <string>
 
25
#include <bitset>
25
26
 
26
27
using namespace std;
27
28
 
389
390
    FALSE  Otherwise
390
391
*/
391
392
 
392
 
bool is_key_used(Table *table, uint32_t idx, const MY_BITMAP *fields)
 
393
bool is_key_used(Table *table, uint32_t idx, const bitset<MAX_FIELDS> *fields)
393
394
{
394
 
  bitmap_clear_all(&table->tmp_set);
 
395
  table->tmp_set.reset();
395
396
  table->mark_columns_used_by_index_no_reset(idx, &table->tmp_set);
396
 
  if (bitmap_is_overlapping(&table->tmp_set, fields))
 
397
  if (isBitmapOverlapping(fields, &table->tmp_set))
397
398
    return 1;
398
399
 
399
400
  /*