← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

Merge from Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1452
1452
                                      List<Item> *items,
1453
1453
                                      DRIZZLE_LOCK **lock)
1454
1454
{
1455
 
  Table tmp_table;              // Used during 'Create_field()'
 
1455
  Table tmp_table;              // Used during 'CreateField()'
1456
1456
  TableShare share;
1457
1457
  Table *table= 0;
1458
1458
  uint32_t select_field_count= items->elements;
1493
1493
 
1494
1494
  while ((item=it++))
1495
1495
  {
1496
 
    Create_field *cr_field;
 
1496
    CreateField *cr_field;
1497
1497
    Field *field, *def_field;
1498
1498
    if (item->type() == Item::FUNC_ITEM)
1499
1499
      if (item->result_type() != STRING_RESULT)
1505
1505
                              (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0,
1506
1506
                              0);
1507
1507
    if (!field ||
1508
 
        !(cr_field=new Create_field(field,(item->type() == Item::FIELD_ITEM ?
 
1508
        !(cr_field=new CreateField(field,(item->type() == Item::FIELD_ITEM ?
1509
1509
                                           ((Item_field *)item)->field :
1510
1510
                                           (Field*) 0))))
1511
1511
      return NULL;