← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_update.c

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_update.c
24
24
  uint i;
25
25
  uchar old_key[MI_MAX_KEY_BUFF],*new_key;
26
26
  my_bool auto_key_changed=0;
27
 
  ulonglong changed;
 
27
  uint64_t changed;
28
28
  MYISAM_SHARE *share= info->s;
29
29
  ha_checksum old_checksum= 0;
30
30
 
92
92
        {
93
93
          if ((int) i == info->lastinx)
94
94
            key_changed|=HA_STATE_WRITTEN;      /* Mark that keyfile changed */
95
 
          changed|=((ulonglong) 1 << i);
 
95
          changed|=((uint64_t) 1 << i);
96
96
          share->keyinfo[i].version++;
97
97
          if (share->keyinfo[i].ck_delete(info,i,old_key,old_length)) goto err;
98
98
          if (share->keyinfo[i].ck_insert(info,i,new_key,new_length)) goto err;
106
106
    If we are running with external locking, we must update the index file
107
107
    that something has changed.
108
108
  */
109
 
  if (changed || !my_disable_locking)
 
109
  if (changed)
110
110
    key_changed|= HA_STATE_CHANGED;
111
111
 
112
112
  if (share->calc_checksum)
173
173
    flag=0;
174
174
    do
175
175
    {
176
 
      if (((ulonglong) 1 << i) & changed)
 
176
      if (((uint64_t) 1 << i) & changed)
177
177
      {
178
178
        {
179
179
          uint new_length=_mi_make_key(info,i,new_key,newrec,pos);