← Back to branch summary

~stewart/drizzle/remove-unused-row-type-in-table-message

« back to all changes in this revision

Viewing changes to drizzled/stored_key.h

  • Committer: Stewart Smith
  • Date: 2010-07-20 16:35:49 UTC
  • mfrom: (1638.1.28 drizzle)
  • Revision ID: stewart@flamingspork.com-20100720163549-zgcsmroyt0njr92d
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/stored_key.h
62
62
                                    null,
63
63
                                    1,
64
64
                                    field_arg->field_name,
65
 
                                    field_arg->table->getMutableShare(),
 
65
                                    field_arg->getTable()->getMutableShare(),
66
66
                                    field_arg->charset());
67
 
      to_field->init(field_arg->table);
 
67
      to_field->init(field_arg->getTable());
68
68
    }
69
69
    else
70
 
      to_field= field_arg->new_key_field(session->mem_root, field_arg->table,
 
70
      to_field= field_arg->new_key_field(session->mem_root, field_arg->getTable(),
71
71
                                        ptr, null, 1);
72
72
 
73
73
    to_field->setWriteSet();
84
84
  enum store_key_result copy()
85
85
  {
86
86
    enum store_key_result result;
87
 
    Session *session= to_field->table->in_use;
 
87
    Session *session= to_field->getTable()->in_use;
88
88
    enum_check_fields saved_count_cuted_fields= session->count_cuted_fields;
89
89
    session->count_cuted_fields= CHECK_FIELD_IGNORE;
90
90
    result= copy_inner();