← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/create_field.cc

Reverted my change to interval_list

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/create_field.cc
185
185
  uint32_t allowed_type_modifier= 0;
186
186
  uint32_t max_field_charlength= MAX_FIELD_CHARLENGTH;
187
187
 
188
 
  if (interval_list == NULL)
189
 
  {
190
 
    void *interval_list_mem=
191
 
        sql_alloc(sizeof(std::vector<String*>));
192
 
    if (interval_list_mem == NULL)
193
 
    {
194
 
      my_error(ER_OUTOFMEMORY, MYF(0), sizeof(std::vector<String*>));
195
 
      return true;
196
 
    }
197
 
    interval_list= new (interval_list_mem) std::vector<String*>;
198
 
  }
199
 
 
200
188
  field= 0;
201
189
  field_name= fld_name;
202
190
  def= fld_default_value;
218
206
  interval= 0;
219
207
  pack_length= key_length= 0;
220
208
  charset= fld_charset;
221
 
  interval_list->empty();
 
209
  interval_list.empty();
222
210
 
223
211
  comment= *fld_comment;
224
212
 
370
358
        List_iterator<String> it(*fld_interval_list);
371
359
        String *tmp;
372
360
        while ((tmp= it++))
373
 
          interval_list->push_back(tmp);
 
361
          interval_list.push_back(tmp);
374
362
        length= 1;
375
363
        break;
376
364
    }