← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_open.cc

  • Committer: Lee Bieber
  • Date: 2011-03-28 18:11:45 UTC
  • mfrom: (2254.1.2 build)
  • Revision ID: kalebral@gmail.com-20110328181145-tfsb6s5ozhuvhfoq
Merge Patrick - Tweaked dbqp so that the existing slave tests work.
Merge Stewart - remove over 1000 lines of mysys

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_open.cc
29
29
#include <drizzled/global_charset_info.h>
30
30
#include <drizzled/charset.h>
31
31
#include <drizzled/memory/multi_malloc.h>
 
32
#include <drizzled/identifier.h>
32
33
 
33
34
 
34
35
using namespace std;
771
772
  state->state.empty    = mi_sizekorr(ptr);     ptr +=8;
772
773
  state->state.key_empty= mi_sizekorr(ptr);     ptr +=8;
773
774
  state->auto_increment=mi_uint8korr(ptr);      ptr +=8;
774
 
  state->state.checksum=(internal::ha_checksum) mi_uint8korr(ptr);      ptr +=8;
 
775
  state->state.checksum=(ha_checksum) mi_uint8korr(ptr);        ptr +=8;
775
776
  state->process= mi_uint4korr(ptr);            ptr +=4;
776
777
  state->unique = mi_uint4korr(ptr);            ptr +=4;
777
778
  state->status = mi_uint4korr(ptr);            ptr +=4;