← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_checksum.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_checksum.cc
17
17
 
18
18
#include "myisam_priv.h"
19
19
 
20
 
ha_checksum mi_checksum(MI_INFO *info, const unsigned char *buf)
 
20
using namespace drizzled;
 
21
 
 
22
internal::ha_checksum mi_checksum(MI_INFO *info, const unsigned char *buf)
21
23
{
22
24
  uint32_t i;
23
 
  ha_checksum crc=0;
 
25
  internal::ha_checksum crc=0;
24
26
  MI_COLUMNDEF *rec=info->s->rec;
25
27
 
26
28
  for (i=info->s->base.fields ; i-- ; buf+=(rec++)->length)
51
53
      pos=buf;
52
54
      break;
53
55
    }
54
 
    crc=my_checksum(crc, pos ? pos : (unsigned char*) "", length);
 
56
    crc=internal::my_checksum(crc, pos ? pos : (unsigned char*) "", length);
55
57
  }
56
58
  return crc;
57
59
}
58
60
 
59
61
 
60
 
ha_checksum mi_static_checksum(MI_INFO *info, const unsigned char *pos)
 
62
internal::ha_checksum mi_static_checksum(MI_INFO *info, const unsigned char *pos)
61
63
{
62
 
  return my_checksum(0, pos, info->s->base.reclength);
 
64
  return internal::my_checksum(0, pos, info->s->base.reclength);
63
65
}