← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Monty Taylor
  • Date: 2008-08-18 23:04:17 UTC
  • mfrom: (327.1.12 drizzle)
  • Revision ID: monty@inaugust.com-20080818230417-442rhihpahnout34
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
663
663
 
664
664
bool Item_field::register_field_in_read_map(uchar *arg)
665
665
{
666
 
  TABLE *table= (TABLE *) arg;
 
666
  Table *table= (Table *) arg;
667
667
  if (field->table == table || !table)
668
668
    bitmap_set_bit(field->table->read_set, field->field_index);
669
669
  return 0;
953
953
int Item::save_in_field_no_warnings(Field *field, bool no_conversions)
954
954
{
955
955
  int res;
956
 
  TABLE *table= field->table;
 
956
  Table *table= field->table;
957
957
  THD *thd= table->in_use;
958
958
  enum_check_fields tmp= thd->count_cuted_fields;
959
959
  my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
3657
3657
  }
3658
3658
  else if (thd->mark_used_columns != MARK_COLUMNS_NONE)
3659
3659
  {
3660
 
    TABLE *table= field->table;
 
3660
    Table *table= field->table;
3661
3661
    MY_BITMAP *current_bitmap, *other_bitmap;
3662
3662
    if (thd->mark_used_columns == MARK_COLUMNS_READ)
3663
3663
    {
4053
4053
  @param table          Table for which the field is created
4054
4054
*/
4055
4055
 
4056
 
Field *Item::make_string_field(TABLE *table)
 
4056
Field *Item::make_string_field(Table *table)
4057
4057
{
4058
4058
  Field *field;
4059
4059
  assert(collation.collation);
4082
4082
    \#    Created field
4083
4083
*/
4084
4084
 
4085
 
Field *Item::tmp_table_field_from_field_type(TABLE *table, bool fixed_length __attribute__((unused)))
 
4085
Field *Item::tmp_table_field_from_field_type(Table *table, bool fixed_length __attribute__((unused)))
4086
4086
{
4087
4087
  /*
4088
4088
    The field functions defines a field to be not null if null_ptr is not 0
4787
4787
  SELECT_LEX *select= (SELECT_LEX*)select_arg;
4788
4788
  assert(fixed);
4789
4789
 
4790
 
  if (field->table != select->context.table_list->table &&
4791
 
      type() != Item::TRIGGER_FIELD_ITEM)
 
4790
  if (field->table != select->context.table_list->table)
4792
4791
  {
4793
4792
    List<Item> *all_fields= &select->join->all_fields;
4794
4793
    Item **ref_pointer_array= select->ref_pointer_array;
6392
6391
    created field
6393
6392
*/
6394
6393
 
6395
 
Field *Item_type_holder::make_field_by_type(TABLE *table)
 
6394
Field *Item_type_holder::make_field_by_type(Table *table)
6396
6395
{
6397
6396
  /*
6398
6397
    The field functions defines a field to be not null if null_ptr is not 0