← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.cc

  • Committer: Monty Taylor
  • Date: 2009-01-29 00:39:19 UTC
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 823.
  • Revision ID: mordred@inaugust.com-20090129003919-8tv61hkqqs9xr2pk
Some Sun warning fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unireg.cc
573
573
 
574
574
    default:
575
575
      abort(); /* Somebody's brain broke. haven't added index type to proto */
576
 
      break;
577
576
    }
578
577
 
579
578
    if (key_info[i].flags & HA_NOSAME)
1101
1100
static bool pack_fields(File file, List<Create_field> &create_fields,
1102
1101
                        ulong data_offset)
1103
1102
{
1104
 
  register uint32_t i;
 
1103
  register uint32_t field_element;
1105
1104
  uint32_t int_count, comment_length=0, vcol_info_length=0;
1106
1105
  unsigned char buff[MAX_FIELD_WIDTH];
1107
1106
  Create_field *field;
1153
1152
  buff[0]=(unsigned char) NAMES_SEP_CHAR;
1154
1153
  if (my_write(file, buff, 1, MYF_RW))
1155
1154
    return(1);
1156
 
  i=0;
 
1155
  field_element=0;
1157
1156
  it.rewind();
1158
1157
  while ((field=it++))
1159
1158
  {
1160
1159
    char *pos= strcpy((char*) buff,field->field_name);
1161
1160
    pos+= strlen(field->field_name);
1162
1161
    *pos++=NAMES_SEP_CHAR;
1163
 
    if (i == create_fields.elements-1)
 
1162
    if (field_element == create_fields.elements-1)
1164
1163
      *pos++=0;
1165
1164
    if (my_write(file, buff, (size_t) (pos-(char*) buff),MYF_RW))
1166
1165
      return(1);
1167
 
    i++;
 
1166
    field_element++;
1168
1167
  }
1169
1168
 
1170
1169
        /* Write intervals */
1180
1179
      {
1181
1180
        unsigned char  sep= 0;
1182
1181
        unsigned char  occ[256];
1183
 
        uint32_t           i;
 
1182
        uint32_t       length_index;
1184
1183
        unsigned char *val= NULL;
1185
1184
 
1186
1185
        memset(occ, 0, sizeof(occ));
1187
1186
 
1188
 
        for (i=0; (val= (unsigned char*) field->interval->type_names[i]); i++)
1189
 
          for (uint32_t j = 0; j < field->interval->type_lengths[i]; j++)
 
1187
        for (length_index=0;
 
1188
             (val= (unsigned char*) field->interval->type_names[length_index]);
 
1189
              length_index++)
 
1190
          for (uint32_t j = 0;
 
1191
               j < field->interval->type_lengths[length_index];
 
1192
               j++)
1190
1193
            occ[(unsigned int) (val[j])]= 1;
1191
1194
 
1192
1195
        if (!occ[(unsigned char)NAMES_SEP_CHAR])
1195
1198
          sep= ',';
1196
1199
        else
1197
1200
        {
1198
 
          for (uint32_t i=1; i<256; i++)
 
1201
          for (uint32_t x=1; x<256; x++)
1199
1202
          {
1200
 
            if(!occ[i])
 
1203
            if(!occ[x])
1201
1204
            {
1202
 
              sep= i;
 
1205
              sep= x;
1203
1206
              break;
1204
1207
            }
1205
1208
          }