~jaypipes/drizzle/split-xa-resource-manager

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Jay Pipes
  • Date: 2010-02-14 20:26:43 UTC
  • mfrom: (1273.1.27 staging)
  • Revision ID: jpipes@serialcoder-20100214202643-ahuqvc8rhn8u7y33
Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
1512
1512
        field= item->tmp_table_field_from_field_type(&tmp_table, 0);
1513
1513
    else
1514
1514
      field= create_tmp_field(session, &tmp_table, item, item->type(),
1515
 
                              (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0,
1516
 
                              0);
 
1515
                              (Item ***) 0, &tmp_field, &def_field, false,
 
1516
                              false, false, 0);
1517
1517
    if (!field ||
1518
1518
        !(cr_field=new CreateField(field,(item->type() == Item::FIELD_ITEM ?
1519
1519
                                           ((Item_field *)item)->field :