← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_hash.c

  • Committer: Brian Aker
  • Date: 2008-07-13 22:45:08 UTC
  • Revision ID: brian@tangent.org-20080713224508-hb20z4okblotb39a
longlong replacement

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_hash.c
930
930
void heap_update_auto_increment(HP_INFO *info, const uchar *record)
931
931
{
932
932
  uint64_t value= 0;                    /* Store unsigned values here */
933
 
  longlong s_value= 0;                  /* Store signed values here */
 
933
  int64_t s_value= 0;                   /* Store signed values here */
934
934
 
935
935
  HA_KEYSEG *keyseg= info->s->keydef[info->s->auto_key - 1].seg;
936
936
  const uchar *key=  (uchar*) record + keyseg->start;
937
937
 
938
938
  switch (info->s->auto_key_type) {
939
939
  case HA_KEYTYPE_INT8:
940
 
    s_value= (longlong) *(char*)key;
 
940
    s_value= (int64_t) *(char*)key;
941
941
    break;
942
942
  case HA_KEYTYPE_BINARY:
943
943
    value=(uint64_t)  *(uchar*) key;
944
944
    break;
945
945
  case HA_KEYTYPE_SHORT_INT:
946
 
    s_value= (longlong) sint2korr(key);
 
946
    s_value= (int64_t) sint2korr(key);
947
947
    break;
948
948
  case HA_KEYTYPE_USHORT_INT:
949
949
    value=(uint64_t) uint2korr(key);
950
950
    break;
951
951
  case HA_KEYTYPE_LONG_INT:
952
 
    s_value= (longlong) sint4korr(key);
 
952
    s_value= (int64_t) sint4korr(key);
953
953
    break;
954
954
  case HA_KEYTYPE_ULONG_INT:
955
955
    value=(uint64_t) uint4korr(key);
956
956
    break;
957
957
  case HA_KEYTYPE_INT24:
958
 
    s_value= (longlong) sint3korr(key);
 
958
    s_value= (int64_t) sint3korr(key);
959
959
    break;
960
960
  case HA_KEYTYPE_UINT24:
961
961
    value=(uint64_t) uint3korr(key);