diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-12-14 16:11:47 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-12-14 16:11:47 +0100 |
| commit | 5d32ba4e0702a72fdc60f6028736c1fb82f54073 (patch) | |
| tree | 56b63c558d9690533834cf296cf5c567beec744a /strings | |
| parent | 594f28a5e053f33d98d63844bf4f3da732235ebe (diff) | |
| download | mariadb-git-5d32ba4e0702a72fdc60f6028736c1fb82f54073.tar.gz | |
Recommit of patch for bug#49028 for 5.1.
Includes both patch from bug#48737 (without test,
which should go to next-mr) and test for
bug#49028.
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-ucs2.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index a1c691a462b..cead55f8a0a 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -1602,16 +1602,6 @@ fill_max_and_min: *min_str++= *max_str++ = ptr[1]; } - /* Temporary fix for handling w_one at end of string (key compression) */ - { - char *tmp; - for (tmp= min_str ; tmp-1 > min_org && tmp[-1] == '\0' && tmp[-2]=='\0';) - { - *--tmp=' '; - *--tmp='\0'; - } - } - *min_length= *max_length = (size_t) (min_str - min_org); while (min_str + 1 < min_end) { |