← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/stored_key.h

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-11-12 12:26:01 UTC
  • mfrom: (1.1.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101112122601-myppfj3tfmlkccuq
Tags: upstream-2010.11.03
Import upstream version 2010.11.03

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->s,
66
65
                                    field_arg->charset());
67
 
      to_field->init(field_arg->table);
 
66
      to_field->init(field_arg->getTable());
68
67
    }
69
68
    else
70
 
      to_field= field_arg->new_key_field(session->mem_root, field_arg->table,
 
69
      to_field= field_arg->new_key_field(session->mem_root, field_arg->getTable(),
71
70
                                        ptr, null, 1);
72
71
 
73
72
    to_field->setWriteSet();
84
83
  enum store_key_result copy()
85
84
  {
86
85
    enum store_key_result result;
87
 
    Session *session= to_field->table->in_use;
 
86
    Session *session= to_field->getTable()->in_use;
88
87
    enum_check_fields saved_count_cuted_fields= session->count_cuted_fields;
89
88
    session->count_cuted_fields= CHECK_FIELD_IGNORE;
90
89
    result= copy_inner();