← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_table.cc

  • Committer: Monty Taylor
  • Date: 2008-07-05 16:19:09 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: monty@inaugust.com-20080705161909-v2xge1mp52wuex3u
Removed HA_END_SPACE_KEY and references to it. It was _supposed_ to be gone anyway, but the ifdef around it was broken (MYSQL_VERSION_ID was actually undefined.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_table.cc
1601
1601
  {
1602
1602
    if (!(b_flags & HA_NOSAME))
1603
1603
      return -1;
1604
 
    if ((a_flags ^ b_flags) & (HA_NULL_PART_KEY | HA_END_SPACE_KEY))
 
1604
    if ((a_flags ^ b_flags) & (HA_NULL_PART_KEY))
1605
1605
    {
1606
1606
      /* Sort NOT NULL keys before other keys */
1607
 
      return (a_flags & (HA_NULL_PART_KEY | HA_END_SPACE_KEY)) ? 1 : -1;
 
1607
      return (a_flags & (HA_NULL_PART_KEY)) ? 1 : -1;
1608
1608
    }
1609
1609
    if (a->name == primary_key_name)
1610
1610
      return -1;