← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/foreign_key.cc

  • Committer: Lee Bieber
  • Date: 2011-02-23 17:17:54 UTC
  • mfrom: (2194.1.3 build)
  • Revision ID: kalebral@gmail.com-20110223171754-5g62btbvgtzsev3n
Merge Stewart - 676770: Error log logging 'Sort aborted' messages when DML fails with ER_INVALID_ENUM_VALUE     
Merge Olaf - Use Item_equal::begin() and Use List::size()
Merge Olaf - Delete drizzled/strfunc.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/foreign_key.cc
108
108
  /* Ensure that 'a' is the generated key */
109
109
  if (a->generated)
110
110
  {
111
 
    if (b->generated && a->columns.elements > b->columns.elements)
 
111
    if (b->generated && a->columns.size() > b->columns.size())
112
112
      std::swap(a, b);                       // Put shorter key in 'a'
113
113
  }
114
114
  else
119
119
  }
120
120
 
121
121
  /* Test if 'a' is a prefix of 'b' */
122
 
  if (a->columns.elements > b->columns.elements)
 
122
  if (a->columns.size() > b->columns.size())
123
123
    return true;                                // Can't be prefix
124
124
 
125
125
  List<Key_part_spec>::iterator col_it1(a->columns.begin());