← 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-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

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,
 
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();