← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_unique.c

  • Committer: Brian Aker
  • Date: 2008-10-06 06:47:29 UTC
  • Revision ID: brian@tangent.org-20081006064729-2i9mhjkzyvow9xsm
Remove uint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_unique.c
81
81
  for (keyseg=def->seg ; keyseg < def->end ; keyseg++)
82
82
  {
83
83
    enum ha_base_keytype type=(enum ha_base_keytype) keyseg->type;
84
 
    uint length=keyseg->length;
 
84
    uint32_t length=keyseg->length;
85
85
 
86
86
    if (keyseg->null_bit)
87
87
    {
100
100
    pos= record+keyseg->start;
101
101
    if (keyseg->flag & HA_VAR_LENGTH_PART)
102
102
    {
103
 
      uint pack_length=  keyseg->bit_start;
104
 
      uint tmp_length= (pack_length == 1 ? (uint) *(unsigned char*) pos :
 
103
      uint32_t pack_length=  keyseg->bit_start;
 
104
      uint32_t tmp_length= (pack_length == 1 ? (uint) *(unsigned char*) pos :
105
105
                        uint2korr(pos));
106
106
      pos+= pack_length;                        /* Skip VARCHAR length */
107
107
      set_if_smaller(length,tmp_length);
108
108
    }
109
109
    else if (keyseg->flag & HA_BLOB_PART)
110
110
    {
111
 
      uint tmp_length=_mi_calc_blob_length(keyseg->bit_start,pos);
 
111
      uint32_t tmp_length=_mi_calc_blob_length(keyseg->bit_start,pos);
112
112
      memcpy(&pos,pos+keyseg->bit_start,sizeof(char*));
113
113
      if (!length || length > tmp_length)
114
114
        length=tmp_length;                      /* The whole blob */
152
152
  for (keyseg=def->seg ; keyseg < def->end ; keyseg++)
153
153
  {
154
154
    enum ha_base_keytype type=(enum ha_base_keytype) keyseg->type;
155
 
    uint a_length, b_length;
 
155
    uint32_t a_length, b_length;
156
156
    a_length= b_length= keyseg->length;
157
157
 
158
158
    /* If part is NULL it's regarded as different */
159
159
    if (keyseg->null_bit)
160
160
    {
161
 
      uint tmp;
 
161
      uint32_t tmp;
162
162
      if ((tmp=(a[keyseg->null_pos] & keyseg->null_bit)) !=
163
163
          (uint) (b[keyseg->null_pos] & keyseg->null_bit))
164
164
        return 1;
173
173
    pos_b= b+keyseg->start;
174
174
    if (keyseg->flag & HA_VAR_LENGTH_PART)
175
175
    {
176
 
      uint pack_length= keyseg->bit_start;
 
176
      uint32_t pack_length= keyseg->bit_start;
177
177
      if (pack_length == 1)
178
178
      {
179
179
        a_length= (uint) *(unsigned char*) pos_a++;