← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

Merged vcol stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
11391
11391
      empty_record(table);                      // Make empty record
11392
11392
      return -1;
11393
11393
    }
 
11394
    update_virtual_fields_marked_for_write(table);
11394
11395
    store_record(table,record[1]);
11395
11396
  }
11396
11397
  else if (!table->status)                      // Only happens with left join
11439
11440
        return table->report_error(error);
11440
11441
      return -1;
11441
11442
    }
 
11443
    update_virtual_fields_marked_for_write(table);
11442
11444
    store_record(table,record[1]);
11443
11445
  }
11444
11446
  else if (!(table->status & ~STATUS_NULL_ROW)) // Only happens with left join
11547
11549
      return table->report_error(error);
11548
11550
    return -1; /* purecov: inspected */
11549
11551
  }
 
11552
  update_virtual_fields_marked_for_write(table);
11550
11553
  return 0;
11551
11554
}
11552
11555
 
11633
11636
    table->status= STATUS_GARBAGE;
11634
11637
    return -1;
11635
11638
  }
 
11639
  update_virtual_fields_marked_for_write(table);
11636
11640
  return 0;
11637
11641
}
11638
11642
 
11652
11656
    table->status=STATUS_NOT_FOUND;
11653
11657
    error= -1;
11654
11658
  }
 
11659
  update_virtual_fields_marked_for_write(table);
11655
11660
  return error;
11656
11661
}
11657
11662
 
11732
11737
      table->report_error(error);
11733
11738
    return -1;
11734
11739
  }
 
11740
  if (not error)
 
11741
    update_virtual_fields_marked_for_write(tab->table);
11735
11742
  return 0;
11736
11743
}
11737
11744
 
11751
11758
 
11752
11759
      if ((error=info->file->index_next(info->record)))
11753
11760
        return info->table->report_error(error);
11754
 
      
 
11761
      if (not error)
 
11762
        update_virtual_fields_marked_for_write(tab->table);
11755
11763
    } while (!key_cmp(tab->table->key_info[tab->index].key_part, 
11756
11764
                      tab->insideout_buf, key->key_length));
11757
11765
    tab->insideout_match_tab->found_match= 0;
11768
11776
  int error;
11769
11777
  if ((error=info->file->index_next(info->record)))
11770
11778
    return info->table->report_error(error);
 
11779
  if (not error)
 
11780
    update_virtual_fields_marked_for_write(info->table);
11771
11781
  return 0;
11772
11782
}
11773
11783
 
11793
11803
    table->file->ha_index_init(tab->index, 1);
11794
11804
  if ((error= tab->table->file->index_last(tab->table->record[0])))
11795
11805
    return table->report_error(error);
 
11806
  if (not error)
 
11807
    update_virtual_fields_marked_for_write(tab->table);
11796
11808
  return 0;
11797
11809
}
11798
11810
 
11803
11815
  int error;
11804
11816
  if ((error= info->file->index_prev(info->record)))
11805
11817
    return info->table->report_error(error);
 
11818
  if (not error)
 
11819
    update_virtual_fields_marked_for_write(info->table);
11806
11820
  return 0;
11807
11821
}
11808
11822