← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_create.c

  • 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:
storage/heap/hp_create.c
85
85
          keyinfo->seg[j].type= HA_KEYTYPE_VARTEXT1;
86
86
          /* fall_through */
87
87
        case HA_KEYTYPE_VARTEXT1:
88
 
          if (!my_binary_compare(keyinfo->seg[j].charset))
89
 
            keyinfo->flag|= HA_END_SPACE_KEY;
90
88
          keyinfo->flag|= HA_VAR_LENGTH_KEY;
91
89
          length+= 2;
92
90
          /* Save number of bytes used to store length */
96
94
          /* Case-insensitiveness is handled in coll->hash_sort */
97
95
          /* fall_through */
98
96
        case HA_KEYTYPE_VARTEXT2:
99
 
          if (!my_binary_compare(keyinfo->seg[j].charset))
100
 
            keyinfo->flag|= HA_END_SPACE_KEY;
101
97
          keyinfo->flag|= HA_VAR_LENGTH_KEY;
102
98
          length+= 2;
103
99
          /* Save number of bytes used to store length */
111
107
        default:
112
108
          break;
113
109
        }
114
 
        if (keyinfo->seg[j].flag & HA_END_SPACE_ARE_EQUAL)
115
 
          keyinfo->flag|= HA_END_SPACE_KEY;
116
110
      }
117
111
      keyinfo->length= length;
118
112
      length+= keyinfo->rb_tree.size_of_element +