Commit e9abde6f authored by unknown's avatar unknown
Browse files

Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
parents 828c4633 ba144e22

heap/hp_hash.c

+4 −4
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key, 
    key+= seg->length;

  }

  memcpy(key, &recpos, sizeof(byte*));

  return key - start_key;

  return (uint) (key - start_key);

}
@@ -844,7 +844,7 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old, 
    key+= seg->length;

    k_len-= seg->length;

  }

  return key - start_key;

  return (uint) (key - start_key);

}
@@ -866,7 +866,7 @@ uint hp_rb_null_key_length(HP_KEYDEF *keydef, const byte *key) 
      continue;

    key+= seg->length;

  }

  return key - start_key;

  return (uint) (key - start_key);

}
@@ -886,7 +886,7 @@ uint hp_rb_var_key_length(HP_KEYDEF *keydef, const byte *key) 
    }

    key+= length;

  }

  return key - start_key;

  return (uint) (key - start_key);

}

heap/hp_update.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int heap_update(HP_INFO *info, const byte *old, const byte *heap_new) 
 err:

  if (my_errno == HA_ERR_FOUND_DUPP_KEY)

  {

    info->errkey = keydef - share->keydef;

    info->errkey = (int) (keydef - share->keydef);

    if (keydef->algorithm == HA_KEY_ALG_BTREE)

    {

      /* we don't need to delete non-inserted key from rb-tree */

mysys/default.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static void init_default_directories() 
  /* Only add shared system directory if different from default. */

  if (GetSystemWindowsDirectory(shared_system_dir,sizeof(shared_system_dir)) &&

      strcmp(system_dir, shared_system_dir))

    *ptr++= &shared_system_dir;

    *ptr++= (char *)&shared_system_dir;

#endif



#elif defined(__NETWARE__)

mysys/default_modify.c

+3 −3
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ int modify_defaults_file(const char *file_location, const char *option, 
  if (my_fstat(fileno(cnf_file), &file_stat, MYF(0)))

    goto err;



  optlen= strlen(option);

  optval_len= strlen(option_value);

  optlen= (uint) strlen(option);

  optval_len= (uint) strlen(option_value);



  /*

    Reserve space to read the contents of the file and some more
@@ -79,7 +79,7 @@ int modify_defaults_file(const char *file_location, const char *option, 
					FN_REFLEN), MYF(MY_WME))))

    goto malloc_err;



  sect_len= strlen(section_name);

  sect_len= (uint) strlen(section_name);



  for (dst_ptr= file_buffer; fgets(linebuff, BUFF_SIZE, cnf_file); )

  {

mysys/mf_iocache.c

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ int _my_b_read_r(register IO_CACHE *info, byte *Buffer, uint Count) 
      info->error=          info->share->active->error;

      info->read_end=       info->share->active->read_end;

      info->pos_in_file=    info->share->active->pos_in_file;

      len= (info->error == -1 ? -1 : info->read_end-info->buffer);

      len= (int) (info->error == -1 ? -1 : info->read_end-info->buffer);

    }

    info->read_pos=info->buffer;

    info->seek_not_done=0;