← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_update.c

Merged uint fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_update.c
21
21
{
22
22
  int flag,key_changed,save_errno;
23
23
  register my_off_t pos;
24
 
  uint i;
 
24
  uint32_t i;
25
25
  unsigned char old_key[MI_MAX_KEY_BUFF],*new_key;
26
26
  bool auto_key_changed=0;
27
27
  uint64_t changed;
81
81
    if (mi_is_key_active(share->state.key_map, i))
82
82
    {
83
83
      {
84
 
        uint new_length=_mi_make_key(info,i,new_key,newrec,pos);
85
 
        uint old_length=_mi_make_key(info,i,old_key,oldrec,pos);
 
84
        uint32_t new_length=_mi_make_key(info,i,new_key,newrec,pos);
 
85
        uint32_t old_length=_mi_make_key(info,i,old_key,oldrec,pos);
86
86
 
87
87
        /* The above changed info->lastkey2. Inform mi_rnext_same(). */
88
88
        info->update&= ~HA_STATE_RNEXT_SAME;
175
175
      if (((uint64_t) 1 << i) & changed)
176
176
      {
177
177
        {
178
 
          uint new_length=_mi_make_key(info,i,new_key,newrec,pos);
179
 
          uint old_length= _mi_make_key(info,i,old_key,oldrec,pos);
 
178
          uint32_t new_length=_mi_make_key(info,i,new_key,newrec,pos);
 
179
          uint32_t old_length= _mi_make_key(info,i,old_key,oldrec,pos);
180
180
          if ((flag++ && _mi_ck_delete(info,i,new_key,new_length)) ||
181
181
              _mi_ck_write(info,i,old_key,old_length))
182
182
            break;