diff options
| author | monty@mysql.com <> | 2004-12-06 02:00:37 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-06 02:00:37 +0200 |
| commit | 67ce24796584e80cf843b37b09aeb794c9231190 (patch) | |
| tree | b75e098b12b8e91a3470008602bacbb5b3009e45 /mysys/my_handler.c | |
| parent | 46089cfd144be3430f69e2a8b48b0aeee154d6fa (diff) | |
| download | mariadb-git-67ce24796584e80cf843b37b09aeb794c9231190.tar.gz | |
Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
Diffstat (limited to 'mysys/my_handler.c')
| -rw-r--r-- | mysys/my_handler.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysys/my_handler.c b/mysys/my_handler.c index 00f25924e69..cf8bde31e73 100644 --- a/mysys/my_handler.c +++ b/mysys/my_handler.c @@ -21,11 +21,11 @@ int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length, uchar *b, uint b_length, my_bool part_key, my_bool skip_end_space) { - if (skip_end_space) + if (!part_key) return charset_info->coll->strnncollsp(charset_info, a, a_length, - b, b_length); + b, b_length, !skip_end_space); return charset_info->coll->strnncoll(charset_info, a, a_length, - b, b_length, part_key); + b, b_length, part_key); } @@ -208,11 +208,9 @@ int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, break; case HA_KEYTYPE_VARTEXT: { - int a_length,full_a_length,b_length,full_b_length,pack_length; + int a_length,b_length,pack_length; get_key_length(a_length,a); get_key_pack_length(b_length,pack_length,b); - full_a_length= a_length; - full_b_length= b_length; next_key_length=key_length-b_length-pack_length; if (piks && @@ -221,10 +219,12 @@ int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a, next_key_length <= 0), (my_bool) ((nextflag & (SEARCH_FIND | SEARCH_UPDATE)) == - SEARCH_FIND)))) + SEARCH_FIND && + ! (keyseg->flag & + HA_END_SPACE_ARE_EQUAL))))) return ((keyseg->flag & HA_REVERSE_SORT) ? -flag : flag); - a+= full_a_length; - b+= full_b_length; + a+= a_length; + b+= b_length; break; } break; |