← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_update.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_update.cc
18
18
#include "myisam_priv.h"
19
19
#include <drizzled/util/test.h>
20
20
 
 
21
using namespace drizzled;
 
22
 
21
23
int mi_update(register MI_INFO *info, const unsigned char *oldrec, unsigned char *newrec)
22
24
{
23
25
  int flag,key_changed,save_errno;
24
 
  register my_off_t pos;
 
26
  register internal::my_off_t pos;
25
27
  uint32_t i;
26
28
  unsigned char old_key[MI_MAX_KEY_BUFF],*new_key;
27
29
  bool auto_key_changed=0;
28
30
  uint64_t changed;
29
31
  MYISAM_SHARE *share= info->s;
30
 
  ha_checksum old_checksum= 0;
 
32
  internal::ha_checksum old_checksum= 0;
31
33
 
32
34
  if (!(info->update & HA_STATE_AKTIV))
33
35
  {
123
125
    */
124
126
    MI_STATUS_INFO state;
125
127
    ha_rows org_split;
126
 
    my_off_t org_delete_link;
 
128
    internal::my_off_t org_delete_link;
127
129
 
128
130
    memcpy(&state, info->state, sizeof(state));
129
131
    org_split=       share->state.split;